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/LinearGradientMaterial.js b/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js
index 357ce275..ce965296 100644
--- a/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js
+++ b/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js
@@ -98,6 +98,8 @@ function LinearGradientMaterial()
                                                                                                         this._shader.default.u_cos_sin_angle.set([Math.cos(a), Math.sin(a)]);
                                                                                         }
 
+        this.isAnimated                 = function()                    {  return false;                                        }
+
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
@@ -146,6 +148,8 @@ function LinearGradientMaterial()
 
                 // send the current values to the shader
                 this.updateShaderValues();
+
+                console.log( "**** LinearGradientMaterial initialized" );
         }
 
         this.updateShaderValues= function()