Ver código fonte

Merge branch 'master' into master

Adrian Iusca 5 anos atrás
pai
commit
28f4b95ff5
2 arquivos alterados com 2 adições e 0 exclusões
  1. 1 0
      code/glTF/glTFImporter.cpp
  2. 1 0
      code/glTF2/glTF2Importer.cpp

+ 1 - 0
code/glTF/glTFImporter.cpp

@@ -222,6 +222,7 @@ void glTFImporter::ImportMeshes(glTF::Asset& r)
     std::vector<aiMesh*> meshes;
     std::vector<aiMesh*> meshes;
 
 
     unsigned int k = 0;
     unsigned int k = 0;
+    meshOffsets.clear();
 
 
     for (unsigned int m = 0; m < r.meshes.Size(); ++m) {
     for (unsigned int m = 0; m < r.meshes.Size(); ++m) {
         Mesh& mesh = r.meshes[m];
         Mesh& mesh = r.meshes[m];

+ 1 - 0
code/glTF2/glTF2Importer.cpp

@@ -335,6 +335,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset &r) {
 	std::vector<aiMesh *> meshes;
 	std::vector<aiMesh *> meshes;
 
 
 	unsigned int k = 0;
 	unsigned int k = 0;
+    meshOffsets.clear();
 
 
 	for (unsigned int m = 0; m < r.meshes.Size(); ++m) {
 	for (unsigned int m = 0; m < r.meshes.Size(); ++m) {
 		Mesh &mesh = r.meshes[m];
 		Mesh &mesh = r.meshes[m];