aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/fly-material.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-13 13:05:33 -0700
committerNivesh Rajbhandari2012-03-13 13:05:33 -0700
commit92fc2e3c4bca2edb04102431b4959aafe022f329 (patch)
treed48c090f71ed2cd6bd6ce38ff68c36ab69299985 /js/lib/rdge/materials/fly-material.js
parentefb92cf52680d31f05fed3757e74862592cc2d4c (diff)
parentf56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
downloadninja-92fc2e3c4bca2edb04102431b4959aafe022f329.tar.gz
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/lib/rdge/materials/fly-material.js')
-rw-r--r--js/lib/rdge/materials/fly-material.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index 8eadb3ab..bd92ecd8 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -53,7 +53,7 @@ var FlyMaterial = function FlyMaterial() {
53 this._shader.init(); 53 this._shader.init();
54 54
55 // set up the material node 55 // set up the material node
56 this._materialNode = createMaterialNode("flyMaterial"); 56 this._materialNode = createMaterialNode("flyMaterial" + "_" + world.generateUniqueNodeID());
57 this._materialNode.setShader(this._shader); 57 this._materialNode.setShader(this._shader);
58 58
59 this._time = 0; 59 this._time = 0;