aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/backup-delete/Materials/TwistMaterial.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-13 13:05:16 -0700
committerNivesh Rajbhandari2012-03-13 13:05:16 -0700
commite19376c54eedd1f1c457ba405b2f110be376a559 (patch)
treed48c090f71ed2cd6bd6ce38ff68c36ab69299985 /js/helper-classes/backup-delete/Materials/TwistMaterial.js
parent970c2e63aa8ec3f70df2bf073cedb9e3b7617755 (diff)
parentf56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
downloadninja-e19376c54eedd1f1c457ba405b2f110be376a559.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/TwistMaterial.js')
-rw-r--r--js/helper-classes/backup-delete/Materials/TwistMaterial.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/TwistMaterial.js b/js/helper-classes/backup-delete/Materials/TwistMaterial.js
index b113965b..a52440e9 100644
--- a/js/helper-classes/backup-delete/Materials/TwistMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/TwistMaterial.js
@@ -71,7 +71,7 @@ function TwistMaterial()
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("twistMaterial"); 74 this._materialNode = createMaterialNode("twistMaterial_" + world.generateUniqueNodeID());
75 this._materialNode.setShader(this._shader); 75 this._materialNode.setShader(this._shader);
76 76
77 this._time = 0; 77 this._time = 0;