aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-13 11:36:11 -0700
committerPushkar Joshi2012-03-13 11:36:11 -0700
commit6023f7c8258e660388ee33730601f1161f9299e9 (patch)
tree632484428b398f71b8481aa8e30180895ff2483c /js/helper-classes/backup-delete/Materials/PlasmaMaterial.js
parent76f2021618c0a6a99a1b855233e353e84ca99467 (diff)
parent4ad1650f629e7e345eade52ed6dadc233b27cc45 (diff)
downloadninja-6023f7c8258e660388ee33730601f1161f9299e9.tar.gz
Merge branch 'pentool' into brushtool
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