aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.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/helper-classes/backup-delete/Materials/SquareTunnelMaterial.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/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js')
-rw-r--r--js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js b/js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js
index 8238b651..3a8afd18 100644
--- a/js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js
@@ -71,7 +71,7 @@ function SquareTunnelMaterial()
71 this._shader.init(); 71 this._shader.init();
72 72
73 // set up the material node 73 // set up the material node
74 this._materialNode = createMaterialNode("squareTunnelMaterial"); 74 this._materialNode = createMaterialNode("squareTunnelMaterial_" + world.generateUniqueNodeID());
75 this._materialNode.setShader(this._shader); 75 this._materialNode.setShader(this._shader);
76 76
77 this._time = 0; 77 this._time = 0;