Merge pull request #594 from BabylonJS/RaananW-patch-1

Raanan w patch 1

src/Loading/Plugins/babylon.babylonFileLoader.js

@@ -1095,7 +1095,7 @@ var BABYLON;
                         // Material ?
                         if (parsedMesh.materialId) {
                             var materialFound = (loadedMaterialsIds.indexOf(parsedMesh.materialId) !== -1);
-                            if (!materialFound) {
+                            if (!materialFound && parsedData.multiMaterials) {
                                 for (var multimatIndex = 0; multimatIndex < parsedData.multiMaterials.length; multimatIndex++) {
                                     var parsedMultiMaterial = parsedData.multiMaterials[multimatIndex];
                                     if (parsedMultiMaterial.id == parsedMesh.materialId) {
@@ -1346,4 +1346,4 @@ var BABYLON;
         });
     })(Internals = BABYLON.Internals || (BABYLON.Internals = {}));
 })(BABYLON || (BABYLON = {}));
-//# sourceMappingURL=babylon.babylonFileLoader.js.map
+//# sourceMappingURL=babylon.babylonFileLoader.js.map

src/Loading/Plugins/babylon.babylonFileLoader.ts

@@ -1343,7 +1343,7 @@
                     if (parsedMesh.materialId) {
                         var materialFound = (loadedMaterialsIds.indexOf(parsedMesh.materialId) !== -1);
 
-                        if (!materialFound) {
+                        if (!materialFound && parsedData.multiMaterials) {
                             for (var multimatIndex = 0; multimatIndex < parsedData.multiMaterials.length; multimatIndex++) {
                                 var parsedMultiMaterial = parsedData.multiMaterials[multimatIndex];
                                 if (parsedMultiMaterial.id == parsedMesh.materialId) {