Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes

Conflicts:
	js/helper-classes/RDGE/Materials/FlatMaterial.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js b/js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js
index ac1d3fe7..a8b1c18b 100644
--- a/js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js
+++ b/js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js
@@ -80,8 +80,11 @@ function IridescentScalesMaterial()
     /////////////////////////////////////////////////////////////////////// 
         this.dup = function()   {  return new IridescentScalesMaterial();       }
 
-        this.init = function()
+        this.init = function( world )
         {
+                // save the world
+                if (world)  this.setWorld( world );
+
                 // set up the shader
                 this._shader = new jshader();
                 this._shader.def = iridescentScalesShaderDef;