Merge branch 'refs/heads/master' into AddAnimationsLibrary

Conflicts:
	js/panels/presets/default-transition-presets.js

1 files changed, 5 insertions, 2 deletions

diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js
index 13be50f5..d19b44b7 100755
--- a/js/lib/rdge/materials/radial-gradient-material.js
+++ b/js/lib/rdge/materials/radial-gradient-material.js
@@ -193,14 +193,17 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
         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