@babylonjs/core 5.42.2 → 5.43.0

package/Materials/PBR/pbrBaseMaterial.js

@@ -911,6 +911,7 @@ export class PBRBaseMaterial extends PushMaterial {
         const previousEffect = subMesh.effect;
         const lightDisposed = defines._areLightsDisposed;
         let effect = this._prepareEffect(mesh, defines, this.onCompiled, this.onError, useInstances, null, subMesh.getRenderingMesh().hasThinInstances);
+        let forceWasNotReadyPreviously = false;
         if (effect) {
             if (this._onEffectCreatedObservable) {
                 onCreatedEffectParameters.effect = effect;
@@ -921,6 +922,7 @@ export class PBRBaseMaterial extends PushMaterial {
             if (this.allowShaderHotSwapping && previousEffect && !effect.isReady()) {
                 effect = previousEffect;
                 defines.markAsUnprocessed();
+                forceWasNotReadyPreviously = this.isFrozen;
                 if (lightDisposed) {
                     // re register in case it takes more than one frame.
                     defines._areLightsDisposed = true;
@@ -936,7 +938,7 @@ export class PBRBaseMaterial extends PushMaterial {
             return false;
         }
         defines._renderId = scene.getRenderId();
-        subMesh.effect._wasPreviouslyReady = true;
+        subMesh.effect._wasPreviouslyReady = forceWasNotReadyPreviously ? false : true;
         subMesh.effect._wasPreviouslyUsingInstances = !!useInstances;
         if (scene.performancePriority !== ScenePerformancePriority.BackwardCompatible) {
             this.checkReadyOnlyOnce = true;
@@ -1170,7 +1172,7 @@ export class PBRBaseMaterial extends PushMaterial {
             shaderName = this.customShaderNameResolve(shaderName, uniforms, uniformBuffers, samplers, defines, attribs, csnrOptions);
         }
         const join = defines.toString();
-        return engine.createEffect(shaderName, {
+        const effect = engine.createEffect(shaderName, {
             attributes: attribs,
             uniformsNames: uniforms,
             uniformBuffersNames: uniformBuffers,
@@ -1184,6 +1186,8 @@ export class PBRBaseMaterial extends PushMaterial {
             processCodeAfterIncludes: this._eventInfo.customCode,
             multiTarget: defines.PREPASS,
         }, engine);
+        this._eventInfo.customCode = undefined;
+        return effect;
     }
     _prepareDefines(mesh, defines, useInstances = null, useClipPlane = null, useThinInstances = false) {
         var _a;
@@ -1627,7 +1631,7 @@ export class PBRBaseMaterial extends PushMaterial {
             world.toNormalMatrix(this._normalMatrix);
             this.bindOnlyNormalMatrix(this._normalMatrix);
         }
-        const mustRebind = this._mustRebind(scene, effect, mesh.visibility);
+        const mustRebind = effect._forceRebindOnNextCall || this._mustRebind(scene, effect, mesh.visibility);
         // Bones
         MaterialHelper.BindBonesParameters(mesh, this._activeEffect, this.prePassConfiguration);
         let reflectionTexture = null;
@@ -1635,7 +1639,7 @@ export class PBRBaseMaterial extends PushMaterial {
         if (mustRebind) {
             this.bindViewProjection(effect);
             reflectionTexture = this._getReflectionTexture();
-            if (!ubo.useUbo || !this.isFrozen || !ubo.isSync) {
+            if (!ubo.useUbo || !this.isFrozen || !ubo.isSync || effect._forceRebindOnNextCall) {
                 // Texture uniforms
                 if (scene.texturesEnabled) {
                     if (this._albedoTexture && MaterialFlags.DiffuseTextureEnabled) {