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/RadialGradientMaterial.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js') diff --git a/js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js b/js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js index 12842798..45b260ef 100755 --- a/js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js +++ b/js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js @@ -146,15 +146,17 @@ function RadialGradientMaterial() // duplcate method requirde this.dup = function() { return new RadialGradientMaterial(); } - this.init = function() + this.init = function( world ) { + this.setWorld( world ); + // set up the shader this._shader = new jshader(); this._shader.def = radialGradientMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("radialGradientMaterial"); + this._materialNode = createMaterialNode("radialGradientMaterial_" + world.generateUniqueNodeID()); this._materialNode.setShader(this._shader); // set the shader values in the shader -- cgit v1.2.3