aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/julia-material.js
diff options
context:
space:
mode:
authorEric Guzman2012-03-13 13:12:43 -0700
committerEric Guzman2012-03-13 13:12:43 -0700
commit61fd46cad105f0a52afa028e5301b96120f00ab4 (patch)
treed8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js/lib/rdge/materials/julia-material.js
parent7e3161153b87b891875ac65368a19aed12909fa3 (diff)
parentf56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
downloadninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'js/lib/rdge/materials/julia-material.js')
-rw-r--r--js/lib/rdge/materials/julia-material.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index 07536f33..976dfad3 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -55,7 +55,7 @@ var JuliaMaterial = function JuliaMaterial() {
55 this._shader.init(); 55 this._shader.init();
56 56
57 // set up the material node 57 // set up the material node
58 this._materialNode = createMaterialNode("juliaMaterial"); 58 this._materialNode = createMaterialNode("juliaMaterial" + "_" + world.generateUniqueNodeID());
59 this._materialNode.setShader(this._shader); 59 this._materialNode.setShader(this._shader);
60 60
61 this._time = 0; 61 this._time = 0;