@babylonjs/core 6.40.0 → 6.41.0

package/Materials/PBR/pbrBaseMaterial.js

@@ -790,8 +790,9 @@ export class PBRBaseMaterial extends PushMaterial {
         if (!this._uniformBufferLayoutBuilt) {
             this.buildUniformLayout();
         }
-        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;
             }
         }
@@ -939,8 +940,8 @@ export class PBRBaseMaterial extends PushMaterial {
             return false;
         }
         defines._renderId = scene.getRenderId();
-        subMesh.effect._wasPreviouslyReady = forceWasNotReadyPreviously ? false : true;
-        subMesh.effect._wasPreviouslyUsingInstances = !!useInstances;
+        drawWrapper._wasPreviouslyReady = forceWasNotReadyPreviously ? false : true;
+        drawWrapper._wasPreviouslyUsingInstances = !!useInstances;
         this._checkScenePerformancePriority();
         return true;
     }
@@ -1631,7 +1632,7 @@ export class PBRBaseMaterial extends PushMaterial {
             world.toNormalMatrix(this._normalMatrix);
             this.bindOnlyNormalMatrix(this._normalMatrix);
         }
-        const mustRebind = effect._forceRebindOnNextCall || this._mustRebind(scene, effect, mesh.visibility);
+        const mustRebind = this._mustRebind(scene, effect, subMesh, mesh.visibility);
         // Bones
         MaterialHelper.BindBonesParameters(mesh, this._activeEffect, this.prePassConfiguration);
         let reflectionTexture = null;
@@ -1639,7 +1640,7 @@ export class PBRBaseMaterial extends PushMaterial {
         if (mustRebind) {
             this.bindViewProjection(effect);
             reflectionTexture = this._getReflectionTexture();
-            if (!ubo.useUbo || !this.isFrozen || !ubo.isSync || effect._forceRebindOnNextCall) {
+            if (!ubo.useUbo || !this.isFrozen || !ubo.isSync || subMesh._drawWrapper._forceRebindOnNextCall) {
                 // Texture uniforms
                 if (scene.texturesEnabled) {
                     if (this._albedoTexture && MaterialFlags.DiffuseTextureEnabled) {
@@ -1873,7 +1874,7 @@ export class PBRBaseMaterial extends PushMaterial {
             // Log. depth
             MaterialHelper.BindLogDepth(defines, this._activeEffect, scene);
         }
-        this._afterBind(mesh, this._activeEffect);
+        this._afterBind(mesh, this._activeEffect, subMesh);
         ubo.update();
     }
     /**