Merge branch 'master' into gltf_o3dgc

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index a9d8458..42d3e48 100644 (file)
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -617,6 +617,7 @@ ADD_ASSIMP_IMPORTER( 3MF
     D3MFOpcPackage.h
     D3MFOpcPackage.cpp
 )
+SOURCE_GROUP( 3MF FILES ${(3MF_SRCS})
 
 
 SET( Step_SRCS

diff --git a/code/D3MFImporter.cpp b/code/D3MFImporter.cpp
index 1a97168..39fdd1b 100644 (file)
--- a/code/D3MFImporter.cpp
+++ b/code/D3MFImporter.cpp
@@ -66,35 +66,32 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_3MF_IMPORTER
 
 namespace Assimp {
-
 namespace D3MF {
 
 
 namespace XmlTag {
-
-    const std::string model     = "model";
-    const std::string metadata  = "metadata";
-    const std::string resources = "resources";
-    const std::string object    = "object";
-    const std::string mesh      = "mesh";
-    const std::string vertices  = "vertices";
-    const std::string vertex    = "vertex";
-    const std::string triangles = "triangles";
-    const std::string triangle  = "triangle";
-    const std::string x         = "x";
-    const std::string y         = "y";
-    const std::string z         = "z";
-    const std::string v1        = "v1";
-    const std::string v2        = "v2";
-    const std::string v3        = "v3";
-    const std::string id        = "id";
-    const std::string name      = "name";
-    const std::string type      = "type";
-    const std::string build     = "build";
-    const std::string item      = "item";
-    const std::string objectid  = "objectid";
-    const std::string transform = "transform";
-
+    static const std::string model     = "model";
+    static const std::string metadata  = "metadata";
+    static const std::string resources = "resources";
+    static const std::string object    = "object";
+    static const std::string mesh      = "mesh";
+    static const std::string vertices  = "vertices";
+    static const std::string vertex    = "vertex";
+    static const std::string triangles = "triangles";
+    static const std::string triangle  = "triangle";
+    static const std::string x         = "x";
+    static const std::string y         = "y";
+    static const std::string z         = "z";
+    static const std::string v1        = "v1";
+    static const std::string v2        = "v2";
+    static const std::string v3        = "v3";
+    static const std::string id        = "id";
+    static const std::string name      = "name";
+    static const std::string type      = "type";
+    static const std::string build     = "build";
+    static const std::string item      = "item";
+    static const std::string objectid  = "objectid";
+    static const std::string transform = "transform";
 }