From e065244ac75d1d0f25fd5c75cb58e714a13fe16b Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Wed, 14 Mar 2012 08:59:17 -0700 Subject: Squashed commit of the following: merge master into timeline Signed-off-by: Jonathan Duran --- js/helper-classes/backup-delete/Materials/PlasmaMaterial.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/helper-classes/backup-delete/Materials/PlasmaMaterial.js') 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() this.setProperty( "color", [this._time, 0, 0, 1] ); // set up the material node - this._materialNode = createMaterialNode("plasmaMaterial"); + this._materialNode = createMaterialNode("plasmaMaterial_" + world.generateUniqueNodeID()); this._materialNode.setShader(this._shader); } -- cgit v1.2.3