Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

1 files changed, 13 insertions, 6 deletions

diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index b35a101a..6f0e65c7 100755
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -59,22 +59,24 @@ exports.RectTool = Montage.create(ShapeTool, {
             var blRadius = ShapesController.GetValueInPixels(this.options.BLRadiusControl.value, this.options.BLRadiusControl.units, h);
             var brRadius = ShapesController.GetValueInPixels(this.options.BRRadiusControl.value, this.options.BRRadiusControl.units, h);
 
-            var strokeColor = this.options.stroke.webGlColor;
-            var fillColor = this.options.fill.webGlColor;
+            var strokeColor = this.options.stroke.webGlColor || [0,0,0,1];
+            var fillColor = this.options.fill.webGlColor || [1,1,1,1];
             // for default stroke and fill/no materials
             var strokeMaterial = null;
             var fillMaterial = null;
+            var fillM = null;
+            var strokeM = null;
 
             if(this.options.use3D)
             {
-                var strokeM = this.options.strokeMaterial;
+                strokeM = this.options.strokeMaterial;
                 if(strokeM)
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
                 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
 
-                var fillM = this.options.fillMaterial;
+                fillM = this.options.fillMaterial;
                 if(fillM)
                 {
                     fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
@@ -117,12 +119,17 @@ exports.RectTool = Montage.create(ShapeTool, {
                 // TODO - update the shape's info only.  shapeModel will likely need an array of shapes.
             }
 
+            // TODO - This needs to be moved into geom obj's init routine instead of here
+            if(!fillM) {
+                this.setColor(canvas, this.options.fill, true, "rectTool");
+            }
+            if(!strokeM) {
+                this.setColor(canvas, this.options.stroke, false, "rectTool");
+            }
             if(canvas.elementModel.isShape)
             {
                 this.application.ninja.selectionController.selectElement(canvas);
             }
-
-
         }
     }
 });
\ No newline at end of file