Merge pull request #1054 from Temechon/master

Fix bug on obj loader

loaders/OBJ/babylon.objFileLoader.js

@@ -210,7 +210,7 @@ var BABYLON;
             //The complete path to the mtl file
             var pathOfFile = BABYLON.Tools.BaseUrl + rootUrl + url;
             // Loads through the babylon tools to allow fileInput search.
-            BABYLON.Tools.LoadFile(pathOfFile, onSuccess, null, null, false, function () { console.warn("Error - Unable to load " + pathOfFile); });
+            BABYLON.Tools.LoadFile(pathOfFile, onSuccess, null, null, false, function () { console.warn("Error - Unable to load " + pathOfFile); }, true /* synchronous call */);
         };
         OBJFileLoader.prototype.importMesh = function (meshesNames, scene, data, rootUrl, meshes, particleSystems, skeletons) {
             //get the meshes from OBJ file

loaders/OBJ/babylon.objFileLoader.ts

@@ -234,7 +234,8 @@ module BABYLON {
                 null, 
                 null, 
                 false, 
-                () => { console.warn("Error - Unable to load " + pathOfFile); })
+                () => { console.warn("Error - Unable to load " + pathOfFile); }, 
+                true /* synchronous call */);
         }
 
         public importMesh(meshesNames: any, scene: Scene, data: any, rootUrl: string, meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]): boolean {

src/Tools/babylon.tools.ts

@@ -319,13 +319,13 @@
         }
 
         //ANY
-        public static LoadFile(url: string, callback: (data: any) => void, progressCallBack?: () => void, database?, useArrayBuffer?: boolean, onError?: () => void): void {
+        public static LoadFile(url: string, callback: (data: any) => void, progressCallBack?: () => void, database?, useArrayBuffer?: boolean, onError?: () => void, sync?:boolean): void {
             url = Tools.CleanUrl(url);
 
             var noIndexedDB = () => {
                 var request = new XMLHttpRequest();
                 var loadUrl = Tools.BaseUrl + url;
-                request.open('GET', loadUrl, true);
+                request.open('GET', loadUrl, !sync);
 
                 if (useArrayBuffer) {
                     request.responseType = "arraybuffer";