Merge pull request #3728 from bghgary/loader-bug-fix

Fix bug in glTF loader importMeshAsync

loaders/src/glTF/2.0/babylon.glTFLoader.ts

@@ -298,6 +298,12 @@ module BABYLON.GLTF2 {
                     if (node._babylonMesh) {
                         meshes.push(node._babylonMesh);
                     }
+
+                    if (node._primitiveBabylonMeshes) {
+                        for (const babylonMesh of node._primitiveBabylonMeshes) {
+                            meshes.push(babylonMesh);
+                        }
+                    }
                 }
             }
 

tests/unit/babylon/src/Loading/babylon.sceneLoader.tests.ts

@@ -53,6 +53,15 @@ describe('Babylon Scene Loader', function () {
             });
         });
 
+        it('Load BoomBox with ImportMesh', () => {
+            const scene = new BABYLON.Scene(subject);
+            return BABYLON.SceneLoader.ImportMeshAsync(null, "/Playground/scenes/BoomBox/", "BoomBox.gltf", scene).then(result => {
+                expect(result.meshes.length, "meshes.length").to.equal(scene.meshes.length);
+                expect(result.particleSystems.length, "particleSystems.length").to.equal(0);
+                expect(result.skeletons.length, "skeletons.length").to.equal(0);
+            });
+        });
+
         it('Load BoomBox with callbacks', () => {
             let parsedCount = 0;
             let meshCount = 0;
@@ -183,7 +192,7 @@ describe('Babylon Scene Loader', function () {
         it('should be loaded from BoomBox GLTF', () => {
             var scene = new BABYLON.Scene(subject);
             return BABYLON.SceneLoader.LoadAssetContainerAsync("/Playground/scenes/BoomBox/", "BoomBox.gltf", scene).then(container => {
-                expect(container.meshes.length).to.eq(2);
+                expect(container.meshes.length).to.eq(3);
             });
         });
         it('should be adding and removing objects from scene', () => {