@babylonjs/core 6.40.0 → 6.41.0

package/Materials/shaderMaterial.js

@@ -484,16 +484,9 @@ export class ShaderMaterial extends PushMaterial {
         var _a, _b, _c, _d;
         const storeEffectOnSubMeshes = subMesh && this._storeEffectOnSubMeshes;
         if (this.isFrozen) {
-            if (storeEffectOnSubMeshes) {
-                if (subMesh.effect && subMesh.effect._wasPreviouslyReady) {
-                    return true;
-                }
-            }
-            else {
-                const effect = this._drawWrapper.effect;
-                if (effect && effect._wasPreviouslyReady && effect._wasPreviouslyUsingInstances === useInstances) {
-                    return true;
-                }
+            const drawWrapper = storeEffectOnSubMeshes ? subMesh._drawWrapper : this._drawWrapper;
+            if (drawWrapper.effect && drawWrapper._wasPreviouslyReady && drawWrapper._wasPreviouslyUsingInstances === useInstances) {
+                return true;
             }
         }
         const scene = this.getScene();
@@ -665,7 +658,7 @@ export class ShaderMaterial extends PushMaterial {
             samplers = samplers.slice();
             shaderName = this.customShaderNameResolve(shaderName, uniforms, uniformBuffers, samplers, defines, attribs);
         }
-        const drawWrapper = storeEffectOnSubMeshes ? subMesh._getDrawWrapper() : this._drawWrapper;
+        const drawWrapper = storeEffectOnSubMeshes ? subMesh._getDrawWrapper(undefined, true) : this._drawWrapper;
         const previousEffect = (_a = drawWrapper === null || drawWrapper === void 0 ? void 0 : drawWrapper.effect) !== null && _a !== void 0 ? _a : null;
         const previousDefines = (_b = drawWrapper === null || drawWrapper === void 0 ? void 0 : drawWrapper.defines) !== null && _b !== void 0 ? _b : null;
         const join = defines.join("\n");
@@ -695,14 +688,14 @@ export class ShaderMaterial extends PushMaterial {
                 this._onEffectCreatedObservable.notifyObservers(onCreatedEffectParameters);
             }
         }
-        effect._wasPreviouslyUsingInstances = !!useInstances;
+        drawWrapper._wasPreviouslyUsingInstances = !!useInstances;
         if ((_d = !(effect === null || effect === void 0 ? void 0 : effect.isReady())) !== null && _d !== void 0 ? _d : true) {
             return false;
         }
         if (previousEffect !== effect) {
             scene.resetCachedMaterial();
         }
-        effect._wasPreviouslyReady = true;
+        drawWrapper._wasPreviouslyReady = true;
         return true;
     }
     /**
@@ -776,7 +769,7 @@ export class ShaderMaterial extends PushMaterial {
                 }
             }
         }
-        const mustRebind = mesh && storeEffectOnSubMeshes ? this._mustRebind(scene, effect, mesh.visibility) : scene.getCachedMaterial() !== this;
+        const mustRebind = mesh && storeEffectOnSubMeshes ? this._mustRebind(scene, effect, subMesh, mesh.visibility) : scene.getCachedMaterial() !== this;
         if (effect && mustRebind) {
             if (!useSceneUBO && this._options.uniforms.indexOf("view") !== -1) {
                 effect.setMatrix("view", scene.getViewMatrix());
@@ -919,10 +912,11 @@ export class ShaderMaterial extends PushMaterial {
             }
             const bvaManager = mesh.bakedVertexAnimationManager;
             if (bvaManager && bvaManager.isEnabled) {
-                (_a = mesh.bakedVertexAnimationManager) === null || _a === void 0 ? void 0 : _a.bind(effect, !!effect._wasPreviouslyUsingInstances);
+                const drawWrapper = storeEffectOnSubMeshes ? subMesh._drawWrapper : this._drawWrapper;
+                (_a = mesh.bakedVertexAnimationManager) === null || _a === void 0 ? void 0 : _a.bind(effect, !!drawWrapper._wasPreviouslyUsingInstances);
             }
         }
-        this._afterBind(mesh, effect);
+        this._afterBind(mesh, effect, subMesh);
     }
     /**
      * Gets the active textures from the material