瀏覽代碼

Merge pull request #5633 from haroldma/master

Fix #5631: Call onError even when fallback is loaded
David Catuhe 6 年之前
父節點
當前提交
38663d0b5f
共有 1 個文件被更改,包括 2 次插入4 次删除
  1. 2 4
      src/Engine/babylon.engine.ts

+ 2 - 4
src/Engine/babylon.engine.ts

@@ -4312,8 +4312,7 @@ module BABYLON {
                         customFallback = true;
                         customFallback = true;
                         excludeLoaders.push(loader);
                         excludeLoaders.push(loader);
                         Tools.Warn((loader.constructor as any).name + " failed when trying to load " + texture.url + ", falling back to the next supported loader");
                         Tools.Warn((loader.constructor as any).name + " failed when trying to load " + texture.url + ", falling back to the next supported loader");
-                        this.createTexture(urlArg, noMipmap, texture.invertY, scene, samplingMode, null, onError, buffer, texture, undefined, undefined, excludeLoaders);
-                        return;
+                        this.createTexture(urlArg, noMipmap, texture.invertY, scene, samplingMode, null, null, buffer, texture, undefined, undefined, excludeLoaders);
                     }
                     }
                 }
                 }
 
 
@@ -4322,8 +4321,7 @@ module BABYLON {
                         texture.onLoadedObservable.remove(onLoadObserver);
                         texture.onLoadedObservable.remove(onLoadObserver);
                     }
                     }
                     if (Tools.UseFallbackTexture) {
                     if (Tools.UseFallbackTexture) {
-                        this.createTexture(Tools.fallbackTexture, noMipmap, texture.invertY, scene, samplingMode, null, onError, buffer, texture);
-                        return;
+                        this.createTexture(Tools.fallbackTexture, noMipmap, texture.invertY, scene, samplingMode, null, null, buffer, texture);
                     }
                     }
                 }
                 }