|
@@ -1070,27 +1070,15 @@ export class Material implements IAnimatable {
|
|
|
var allDone = true, lastError = null;
|
|
|
if (mesh.subMeshes) {
|
|
|
let tempSubMesh = new SubMesh(0, 0, 0, 0, 0, mesh, undefined, false, false);
|
|
|
- if (this._storeEffectOnSubMeshes) {
|
|
|
- if (tempSubMesh._materialDefines) {
|
|
|
- tempSubMesh._materialDefines._renderId = -1;
|
|
|
- }
|
|
|
- if (!this.isReadyForSubMesh(mesh, tempSubMesh, localOptions.useInstances)) {
|
|
|
- if (tempSubMesh.effect && tempSubMesh.effect.getCompilationError() && tempSubMesh.effect.allFallbacksProcessed()) {
|
|
|
- lastError = tempSubMesh.effect.getCompilationError();
|
|
|
- } else {
|
|
|
- allDone = false;
|
|
|
- setTimeout(checkReady, 16);
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- tempSubMesh._renderId = -1;
|
|
|
- if (!this.isReady(mesh, localOptions.useInstances)) {
|
|
|
- if (this.getEffect() && this.getEffect()!.getCompilationError() && this.getEffect()!.allFallbacksProcessed()) {
|
|
|
- lastError = this.getEffect()!.getCompilationError();
|
|
|
- } else {
|
|
|
- allDone = false;
|
|
|
- setTimeout(checkReady, 16);
|
|
|
- }
|
|
|
+ if (tempSubMesh._materialDefines) {
|
|
|
+ tempSubMesh._materialDefines._renderId = -1;
|
|
|
+ }
|
|
|
+ if (!this.isReadyForSubMesh(mesh, tempSubMesh, localOptions.useInstances)) {
|
|
|
+ if (tempSubMesh.effect && tempSubMesh.effect.getCompilationError() && tempSubMesh.effect.allFallbacksProcessed()) {
|
|
|
+ lastError = tempSubMesh.effect.getCompilationError();
|
|
|
+ } else {
|
|
|
+ allDone = false;
|
|
|
+ setTimeout(checkReady, 16);
|
|
|
}
|
|
|
}
|
|
|
}
|