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, 0 deletions

diff --git a/js/helper-classes/RDGE/Materials/MandelMaterial.js b/js/helper-classes/RDGE/Materials/MandelMaterial.js
index 76083b76..25b08404 100644
--- a/js/helper-classes/RDGE/Materials/MandelMaterial.js
+++ b/js/helper-classes/RDGE/Materials/MandelMaterial.js
@@ -42,6 +42,7 @@ function MandelMaterial()
 
     ///////////////////////////////////////////////////////////////////////
 
+        this.isAnimated = function()  {  return true;  }
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
@@ -64,6 +65,9 @@ function MandelMaterial()
 
         this.init = function( world )
         {
+                // save the world
+                if (world)  this.setWorld( world );
+
                 // set up the shader
                 this._shader = new jshader();
                 this._shader.def = MandelMaterialDef;