Better cache support for pbr (same as last commit for std)

dist/preview release/babylon.max.js

@@ -52738,6 +52738,13 @@ var BABYLON;
                 }
             }
             var scene = this.getScene();
+            var engine = scene.getEngine();
+            var needNormals = false;
+            var needUVs = false;
+            this._defines.reset();
+            if (scene.lightsEnabled && !this.disableLighting) {
+                needNormals = BABYLON.MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines, this.maxSimultaneousLights) || needNormals;
+            }
             if (!this.checkReadyOnEveryCall) {
                 if (this._renderId === scene.getRenderId()) {
                     if (this._checkCache(scene, mesh, useInstances)) {
@@ -52745,10 +52752,6 @@ var BABYLON;
                     }
                 }
             }
-            var engine = scene.getEngine();
-            var needNormals = false;
-            var needUVs = false;
-            this._defines.reset();
             if (scene.texturesEnabled) {
                 if (scene.getEngine().getCaps().textureLOD) {
                     this._defines.LODBASEDMICROSFURACE = true;
@@ -52954,9 +52957,6 @@ var BABYLON;
             if (scene.fogEnabled && mesh && mesh.applyFog && scene.fogMode !== BABYLON.Scene.FOGMODE_NONE && this.fogEnabled) {
                 this._defines.FOG = true;
             }
-            if (scene.lightsEnabled && !this.disableLighting) {
-                needNormals = BABYLON.MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines, this.maxSimultaneousLights) || needNormals;
-            }
             if (BABYLON.StandardMaterial.FresnelEnabled) {
                 // Fresnel
                 if (this.opacityFresnelParameters && this.opacityFresnelParameters.isEnabled ||

src/Materials/babylon.pbrMaterial.js

@@ -433,6 +433,13 @@ var BABYLON;
                 }
             }
             var scene = this.getScene();
+            var engine = scene.getEngine();
+            var needNormals = false;
+            var needUVs = false;
+            this._defines.reset();
+            if (scene.lightsEnabled && !this.disableLighting) {
+                needNormals = BABYLON.MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines, this.maxSimultaneousLights) || needNormals;
+            }
             if (!this.checkReadyOnEveryCall) {
                 if (this._renderId === scene.getRenderId()) {
                     if (this._checkCache(scene, mesh, useInstances)) {
@@ -440,10 +447,6 @@ var BABYLON;
                     }
                 }
             }
-            var engine = scene.getEngine();
-            var needNormals = false;
-            var needUVs = false;
-            this._defines.reset();
             if (scene.texturesEnabled) {
                 if (scene.getEngine().getCaps().textureLOD) {
                     this._defines.LODBASEDMICROSFURACE = true;
@@ -649,9 +652,6 @@ var BABYLON;
             if (scene.fogEnabled && mesh && mesh.applyFog && scene.fogMode !== BABYLON.Scene.FOGMODE_NONE && this.fogEnabled) {
                 this._defines.FOG = true;
             }
-            if (scene.lightsEnabled && !this.disableLighting) {
-                needNormals = BABYLON.MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines, this.maxSimultaneousLights) || needNormals;
-            }
             if (BABYLON.StandardMaterial.FresnelEnabled) {
                 // Fresnel
                 if (this.opacityFresnelParameters && this.opacityFresnelParameters.isEnabled ||

src/Materials/babylon.pbrMaterial.ts

@@ -603,6 +603,15 @@
             }
 
             var scene = this.getScene();
+            var engine = scene.getEngine();
+            var needNormals = false;
+            var needUVs = false;
+
+            this._defines.reset();
+
+            if (scene.lightsEnabled && !this.disableLighting) {
+                needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines, this.maxSimultaneousLights) || needNormals;
+            }
 
             if (!this.checkReadyOnEveryCall) {
                 if (this._renderId === scene.getRenderId()) {
@@ -612,12 +621,6 @@
                 }
             }
 
-            var engine = scene.getEngine();
-            var needNormals = false;
-            var needUVs = false;
-
-            this._defines.reset();
-
             if (scene.texturesEnabled) {
                 if (scene.getEngine().getCaps().textureLOD) {
                     this._defines.LODBASEDMICROSFURACE = true;
@@ -848,10 +851,6 @@
                 this._defines.FOG = true;
             }
 
-            if (scene.lightsEnabled && !this.disableLighting) {
-                needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines, this.maxSimultaneousLights) || needNormals;
-            }
-
             if (StandardMaterial.FresnelEnabled) {
                 // Fresnel
                 if (this.opacityFresnelParameters && this.opacityFresnelParameters.isEnabled ||