Merge branch 'master' into master

2020-02-24 21:05:51 +02:00
parent 344170469c 824a412239
commit 28f4b95ff5
2 changed files with 2 additions and 0 deletions
--- a/code/glTF/glTFImporter.cpp
+++ b/code/glTF/glTFImporter.cpp
@@ -222,6 +222,7 @@ void glTFImporter::ImportMeshes(glTF::Asset& r)
    std::vector<aiMesh*> meshes;

    unsigned int k = 0;
+    meshOffsets.clear();

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

 	unsigned int k = 0;
+    meshOffsets.clear();

 	for (unsigned int m = 0; m < r.meshes.Size(); ++m) {
 		Mesh &mesh = r.meshes[m];