Merge pull request #380 from guycalledfrank/instfix

Fix instancing when dynamically changing instance count
playcanvas · Aug 19, 2015 · 9cb66ae · 9cb66ae
2 parents ee29f40 + a6a6388
commit 9cb66ae
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/scene/scene_forwardrenderer.js b/src/scene/scene_forwardrenderer.js
@@ -951,13 +951,13 @@ pc.extend(pc, function () {
                     }
 
                     if (material !== prevMaterial) {
-
-                        if (!meshInstance._shader) {
+                        if (!meshInstance._shader || meshInstance._shaderDefs !== objDefs) {
                             meshInstance._shader = material.variants[objDefs];
                             if (!meshInstance._shader) {
                                 material.updateShader(device, scene, objDefs);
                                 meshInstance._shader = material.variants[objDefs] = material.shader;
                             }
+                            meshInstance._shaderDefs = objDefs;
                         }
                         device.setShader(meshInstance._shader);