From e9902ae7a49c765847a34601891bf9c89b330a89 Mon Sep 17 00:00:00 2001
From: Sylvain Thery <sylvain@thery.pipo>
Date: Mon, 17 Dec 2012 11:04:40 +0100
Subject: [PATCH] resolve MultiThread loading problems

---
 include/Algo/Render/GL2/explodeVolumeRender.hpp |  1 +
 src/Topology/generic/genericmap.cpp             | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/include/Algo/Render/GL2/explodeVolumeRender.hpp b/include/Algo/Render/GL2/explodeVolumeRender.hpp
index a332fbf66..b5e56db79 100644
--- a/include/Algo/Render/GL2/explodeVolumeRender.hpp
+++ b/include/Algo/Render/GL2/explodeVolumeRender.hpp
@@ -27,6 +27,7 @@
 #include "Topology/generic/dartmarker.h"
 #include "Topology/generic/cellmarker.h"
 #include "Algo/Geometry/centroid.h"
+#include "Topology/generic/autoAttributeHandler.h"
 
 namespace CGoGN
 {
diff --git a/src/Topology/generic/genericmap.cpp b/src/Topology/generic/genericmap.cpp
index 1ad03ca30..9f71c1122 100644
--- a/src/Topology/generic/genericmap.cpp
+++ b/src/Topology/generic/genericmap.cpp
@@ -592,13 +592,25 @@ bool GenericMap::loadMapBin(const std::string& filename)
 		fs.read(reinterpret_cast<char*>(&(m_mrNbDarts[0])), nb *sizeof(unsigned int));
 	}
 
-
 	// retrieve m_embeddings (from m_attribs)
 	update_m_emb_afterLoad();
 
 	// recursive call from real type of map (for topo relation attributes pointers) down to GenericMap (for Marker_cleaning & pointers)
 	update_topo_shortcuts();
 
+	// restore nbThreads
+	std::vector<std::string> typeMark;
+	unsigned int nbatt0 = m_attribs[0].getAttributesTypes(typeMark);
+	m_nbThreads = 0;
+	for (unsigned int i = 0; i < nbatt0; ++i)
+	{
+		if (typeMark[i] == "Mark")
+			++m_nbThreads;
+	}
+
+
+
+
 	return true;
 }
 
-- 
GitLab