aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/tunnel-material.js
diff options
context:
space:
mode:
authorJose Antonio Marquez Russo2012-03-08 10:49:06 -0800
committerJose Antonio Marquez Russo2012-03-08 10:49:06 -0800
commit85f21e020ac281e8e545df1cf269034de99a00b1 (patch)
tree441834fa8b02b1cc2a970210020d27e06d2c99be /js/lib/rdge/materials/tunnel-material.js
parentd9813946dc28d8c28033a68b68300b9d9eda115c (diff)
parent11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff)
downloadninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/lib/rdge/materials/tunnel-material.js')
-rw-r--r--js/lib/rdge/materials/tunnel-material.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/tunnel-material.js b/js/lib/rdge/materials/tunnel-material.js
index fe787d16..fe0fbd51 100644
--- a/js/lib/rdge/materials/tunnel-material.js
+++ b/js/lib/rdge/materials/tunnel-material.js
@@ -56,7 +56,7 @@ var TunnelMaterial = function TunnelMaterial() {
56 this._shader.init(); 56 this._shader.init();
57 57
58 // set up the material node 58 // set up the material node
59 this._materialNode = createMaterialNode("tunnelMaterial"); 59 this._materialNode = createMaterialNode("tunnelMaterial" + "_" + world.generateUniqueNodeID());
60 this._materialNode.setShader(this._shader); 60 this._materialNode.setShader(this._shader);
61 61
62 this._time = 0; 62 this._time = 0;