aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/relief-tunnel-material.js
diff options
context:
space:
mode:
authorEric Guzman2012-03-17 00:05:14 -0700
committerEric Guzman2012-03-17 00:05:14 -0700
commita3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch)
tree497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/lib/rdge/materials/relief-tunnel-material.js
parenta6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff)
parent954f5a13e371febcb1c0fb8015c577ee51c23130 (diff)
downloadninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts: js/panels/presets/default-transition-presets.js
Diffstat (limited to 'js/lib/rdge/materials/relief-tunnel-material.js')
-rw-r--r--js/lib/rdge/materials/relief-tunnel-material.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/relief-tunnel-material.js b/js/lib/rdge/materials/relief-tunnel-material.js
index 20290895..52c40543 100644
--- a/js/lib/rdge/materials/relief-tunnel-material.js
+++ b/js/lib/rdge/materials/relief-tunnel-material.js
@@ -54,7 +54,7 @@ var ReliefTunnelMaterial = function ReliefTunnelMaterial() {
54 this._shader.init(); 54 this._shader.init();
55 55
56 // set up the material node 56 // set up the material node
57 this._materialNode = createMaterialNode("reliefTunnelMaterial"); 57 this._materialNode = createMaterialNode("reliefTunnelMaterial" + "_" + world.generateUniqueNodeID());
58 this._materialNode.setShader(this._shader); 58 this._materialNode.setShader(this._shader);
59 59
60 this._time = 0; 60 this._time = 0;