@babylonjs/core 6.40.0 → 6.41.0

package/Materials/Node/nodeMaterial.js

@@ -813,9 +813,7 @@ export class NodeMaterial extends PushMaterial {
         const defines = new NodeMaterialDefines();
         const result = this._processDefines(dummyMesh, defines);
         Effect.RegisterShader(tempName, this._fragmentCompilationState._builtCompilationString, this._vertexCompilationState._builtCompilationString);
-        let effect = this.getScene()
-            .getEngine()
-            .createEffect({
+        let effect = this.getScene().getEngine().createEffect({
             vertexElement: tempName,
             fragmentElement: tempName,
         }, [VertexBuffer.PositionKind], this._fragmentCompilationState.uniforms, this._fragmentCompilationState.samplers, defines.toString(), result === null || result === void 0 ? void 0 : result.fallbacks, undefined);
@@ -834,9 +832,7 @@ export class NodeMaterial extends PushMaterial {
             if (result) {
                 Effect.RegisterShader(tempName, this._fragmentCompilationState._builtCompilationString, this._vertexCompilationState._builtCompilationString);
                 TimingTools.SetImmediate(() => {
-                    effect = this.getScene()
-                        .getEngine()
-                        .createEffect({
+                    effect = this.getScene().getEngine().createEffect({
                         vertexElement: tempName,
                         fragmentElement: tempName,
                     }, [VertexBuffer.PositionKind], this._fragmentCompilationState.uniforms, this._fragmentCompilationState.samplers, defines.toString(), result === null || result === void 0 ? void 0 : result.fallbacks, undefined);
@@ -1027,8 +1023,9 @@ export class NodeMaterial extends PushMaterial {
                 this._animationFrame = frameId;
             }
         }
-        if (subMesh.effect && this.isFrozen) {
-            if (subMesh.effect._wasPreviouslyReady && subMesh.effect._wasPreviouslyUsingInstances === useInstances) {
+        const drawWrapper = subMesh._drawWrapper;
+        if (drawWrapper.effect && this.isFrozen) {
+            if (drawWrapper._wasPreviouslyReady && drawWrapper._wasPreviouslyUsingInstances === useInstances) {
                 return true;
             }
         }
@@ -1093,8 +1090,8 @@ export class NodeMaterial extends PushMaterial {
             return false;
         }
         defines._renderId = scene.getRenderId();
-        subMesh.effect._wasPreviouslyReady = true;
-        subMesh.effect._wasPreviouslyUsingInstances = useInstances;
+        drawWrapper._wasPreviouslyReady = true;
+        drawWrapper._wasPreviouslyUsingInstances = useInstances;
         this._checkScenePerformancePriority();
         return true;
     }
@@ -1140,7 +1137,7 @@ export class NodeMaterial extends PushMaterial {
         this._activeEffect = effect;
         // Matrices
         this.bindOnlyWorldMatrix(world);
-        const mustRebind = this._mustRebind(scene, effect, mesh.visibility);
+        const mustRebind = this._mustRebind(scene, effect, subMesh, mesh.visibility);
         const sharedData = this._sharedData;
         if (mustRebind) {
             // Bindable blocks
@@ -1160,7 +1157,7 @@ export class NodeMaterial extends PushMaterial {
                 block.bind(effect, this, mesh, subMesh);
             }
         }
-        this._afterBind(mesh, this._activeEffect);
+        this._afterBind(mesh, this._activeEffect, subMesh);
     }
     /**
      * Gets the active textures from the material