Browse Source

Merge pull request #5510 from bghgary/bug-fix

Add back support for passing in a File object to sceneLoader
David Catuhe 6 years ago
parent
commit
9914e2b8ba
2 changed files with 34 additions and 18 deletions
  1. 33 17
      src/Loading/babylon.sceneLoader.ts
  2. 1 1
      src/Tools/babylon.filesInput.ts

File diff suppressed because it is too large
+ 33 - 17
src/Loading/babylon.sceneLoader.ts


+ 1 - 1
src/Tools/babylon.filesInput.ts

@@ -258,7 +258,7 @@ module BABYLON {
                     this._engine.stopRenderLoop();
                     this._engine.stopRenderLoop();
                 }
                 }
 
 
-                SceneLoader.LoadAsync("file:", this._sceneFileToLoad.name, this._engine, (progress) => {
+                SceneLoader.LoadAsync("file:", this._sceneFileToLoad, this._engine, (progress) => {
                     if (this._progressCallback) {
                     if (this._progressCallback) {
                         this._progressCallback(progress);
                         this._progressCallback(progress);
                     }
                     }