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, 5 insertions, 4 deletions

diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js
index 2f242414..2899e476 100644
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -72,13 +72,14 @@ function GLRectangle()
                 this._materialSpecular = [0.4, 0.4, 0.4,  1.0];
 
                 if(strokeMaterial)
-                {
                         this._strokeMaterial = strokeMaterial;
-                }
+                else
+                        this._strokeMaterial = new FlatMaterial();
+
                 if(fillMaterial)
-                {
                         this._fillMaterial = fillMaterial;
-                }
+                else 
+                        this._fillMaterial = new FlatMaterial();
         }
 
         ///////////////////////////////////////////////////////////////////////