Nightly

dist/preview release/materialsLibrary/babylon.fireMaterial.js

@@ -68,7 +68,7 @@ var BABYLON;
             }
             var defines = subMesh._materialDefines;
             var scene = this.getScene();
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

dist/preview release/materialsLibrary/babylon.furMaterial.js

@@ -108,7 +108,7 @@ var BABYLON;
             }
             var defines = subMesh._materialDefines;
             var scene = this.getScene();
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

dist/preview release/materialsLibrary/babylon.gradientMaterial.js

@@ -112,7 +112,7 @@ var BABYLON;
             }
             var defines = subMesh._materialDefines;
             var scene = this.getScene();
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

dist/preview release/materialsLibrary/babylon.gridMaterial.js

@@ -85,7 +85,7 @@ var BABYLON;
             }
             var defines = subMesh._materialDefines;
             var scene = this.getScene();
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

dist/preview release/materialsLibrary/babylon.lavaMaterial.js

@@ -109,7 +109,7 @@ var BABYLON;
             }
             var defines = subMesh._materialDefines;
             var scene = this.getScene();
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

dist/preview release/materialsLibrary/babylon.normalMaterial.js

@@ -104,7 +104,7 @@ var BABYLON;
             }
             var defines = subMesh._materialDefines;
             var scene = this.getScene();
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

dist/preview release/materialsLibrary/babylon.shadowOnlyMaterial.js

@@ -62,7 +62,7 @@ var BABYLON;
             }
             var defines = subMesh._materialDefines;
             var scene = this.getScene();
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

dist/preview release/materialsLibrary/babylon.simpleMaterial.js

@@ -71,7 +71,7 @@ var BABYLON;
             }
             var defines = subMesh._materialDefines;
             var scene = this.getScene();
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

dist/preview release/materialsLibrary/babylon.skyMaterial.js

@@ -71,7 +71,7 @@ var BABYLON;
             }
             var defines = subMesh._materialDefines;
             var scene = this.getScene();
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

dist/preview release/materialsLibrary/babylon.terrainMaterial.js

@@ -74,7 +74,7 @@ var BABYLON;
             }
             var defines = subMesh._materialDefines;
             var scene = this.getScene();
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

dist/preview release/materialsLibrary/babylon.triPlanarMaterial.js

@@ -77,7 +77,7 @@ var BABYLON;
             }
             var defines = subMesh._materialDefines;
             var scene = this.getScene();
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

dist/preview release/materialsLibrary/babylon.waterMaterial.js

@@ -187,7 +187,7 @@ var BABYLON;
             }
             var defines = subMesh._materialDefines;
             var scene = this.getScene();
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

materialsLibrary/src/fire/babylon.fireMaterial.ts

@@ -78,7 +78,7 @@ module BABYLON {
             var defines = <FireMaterialDefines>subMesh._materialDefines;
             var scene = this.getScene();
 
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

materialsLibrary/src/fur/babylon.furMaterial.ts

@@ -144,7 +144,7 @@ module BABYLON {
             var defines = <FurMaterialDefines>subMesh._materialDefines;
             var scene = this.getScene();
 
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

materialsLibrary/src/gradient/babylon.gradientMaterial.ts

@@ -121,7 +121,7 @@ module BABYLON {
             var defines = <GradientMaterialDefines>subMesh._materialDefines;
             var scene = this.getScene();
 
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

materialsLibrary/src/grid/babylon.gridmaterial.ts

@@ -88,7 +88,7 @@ module BABYLON {
             var defines = <GridMaterialDefines>subMesh._materialDefines;
             var scene = this.getScene();
 
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

materialsLibrary/src/lava/babylon.lavaMaterial.ts

@@ -129,7 +129,7 @@ module BABYLON {
             var defines = <LavaMaterialDefines>subMesh._materialDefines;
             var scene = this.getScene();
 
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

materialsLibrary/src/normal/babylon.normalMaterial.ts

@@ -109,7 +109,7 @@ module BABYLON {
             var defines = <NormalMaterialDefines>subMesh._materialDefines;
             var scene = this.getScene();
 
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

materialsLibrary/src/shadowOnly/babylon.shadowOnlyMaterial.ts

@@ -54,7 +54,7 @@ module BABYLON {
             var defines = <ShadowOnlyMaterialDefines>subMesh._materialDefines;
             var scene = this.getScene();
 
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

materialsLibrary/src/simple/babylon.simpleMaterial.ts

@@ -76,7 +76,7 @@ module BABYLON {
             var defines = <SimpleMaterialDefines>subMesh._materialDefines;
             var scene = this.getScene();
 
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

materialsLibrary/src/sky/babylon.skyMaterial.ts

@@ -82,7 +82,7 @@ module BABYLON {
             var defines = <SkyMaterialDefines>subMesh._materialDefines;
             var scene = this.getScene();
 
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

materialsLibrary/src/terrain/babylon.terrainMaterial.ts

@@ -114,7 +114,7 @@ module BABYLON {
             var defines = <TerrainMaterialDefines>subMesh._materialDefines;
             var scene = this.getScene();
 
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

materialsLibrary/src/triPlanar/babylon.triPlanarMaterial.ts

@@ -118,7 +118,7 @@ module BABYLON {
             var defines = <TriPlanarMaterialDefines>subMesh._materialDefines;
             var scene = this.getScene();
 
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }

materialsLibrary/src/water/babylon.waterMaterial.ts

@@ -226,7 +226,7 @@ module BABYLON {
             var defines = <WaterMaterialDefines>subMesh._materialDefines;
             var scene = this.getScene();
 
-            if (!this.checkReadyOnEveryCall) {
+            if (!this.checkReadyOnEveryCall && subMesh.effect) {
                 if (this._renderId === scene.getRenderId()) {
                     return true;
                 }