Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 4 insertions, 2 deletions

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