aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/mandel-material.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-13 11:24:35 -0700
committerPushkar Joshi2012-03-13 11:24:35 -0700
commit4ad1650f629e7e345eade52ed6dadc233b27cc45 (patch)
tree0e7b925f4dedf27f2684915e7e247e79c4a74aff /js/lib/rdge/materials/mandel-material.js
parent730c42e005b1ebd96448e3bc2dd700ffd8909cb5 (diff)
parent9f3307810541ca6f95d7ca6d1febe8afdcd2c101 (diff)
downloadninja-4ad1650f629e7e345eade52ed6dadc233b27cc45.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/lib/rdge/materials/mandel-material.js')
-rw-r--r--js/lib/rdge/materials/mandel-material.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index 07e009a2..d9f00383 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -66,7 +66,7 @@ var MandelMaterial = function MandelMaterial() {
66 this._shader.init(); 66 this._shader.init();
67 67
68 // set up the material node 68 // set up the material node
69 this._materialNode = createMaterialNode("mandelMaterial"); 69 this._materialNode = createMaterialNode("mandelMaterial" + "_" + world.generateUniqueNodeID());
70 this._materialNode.setShader(this._shader); 70 this._materialNode.setShader(this._shader);
71 71
72 this._time = 0; 72 this._time = 0;