aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/backup-delete/Materials/PlasmaMaterial.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/helper-classes/backup-delete/Materials/PlasmaMaterial.js
parentefb92cf52680d31f05fed3757e74862592cc2d4c (diff)
parentf56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
downloadninja-92fc2e3c4bca2edb04102431b4959aafe022f329.tar.gz
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/PlasmaMaterial.js')
-rw-r--r--js/helper-classes/backup-delete/Materials/PlasmaMaterial.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js b/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js
index a65f3a33..4e60df9f 100644
--- a/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js
@@ -74,7 +74,7 @@ function PlasmaMaterial()
74 this.setProperty( "color", [this._time, 0, 0, 1] ); 74 this.setProperty( "color", [this._time, 0, 0, 1] );
75 75
76 // set up the material node 76 // set up the material node
77 this._materialNode = createMaterialNode("plasmaMaterial"); 77 this._materialNode = createMaterialNode("plasmaMaterial_" + world.generateUniqueNodeID());
78 this._materialNode.setShader(this._shader); 78 this._materialNode.setShader(this._shader);
79 } 79 }
80 80