Browse Source

Merge branch 'master' into reorg

Kim Kulling 6 năm trước cách đây
mục cha
commit
fc065d8ab4

+ 5 - 1
code/glTF/glTFImporter.cpp

@@ -713,7 +713,11 @@ void glTFImporter::ImportEmbeddedTextures(glTF::Asset& r)
     }
     }
 }
 }
 
 
-void glTFImporter::InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler) {
+void glTFImporter::InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler)
+{
+    // clean all member arrays
+    meshOffsets.clear();
+    embeddedTexIdxs.clear();
 
 
     this->mScene = pScene;
     this->mScene = pScene;
 
 

+ 5 - 1
code/glTF2/glTF2Importer.cpp

@@ -1128,7 +1128,11 @@ void glTF2Importer::ImportEmbeddedTextures(glTF2::Asset& r)
     }
     }
 }
 }
 
 
-void glTF2Importer::InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler) {
+void glTF2Importer::InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler)
+{
+    // clean all member arrays
+    meshOffsets.clear();
+    embeddedTexIdxs.clear();
 
 
     this->mScene = pScene;
     this->mScene = pScene;