Fixed not being able to draw linear and radial gradients. Also fixed IKNINJA-1721 - File dirty marker does not show when modifying elements and IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Squashed commit of the following:

commit 7cad082c89911d34a99feeef8e91d22b89cae8f1
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Thu Jun 28 17:52:07 2012 -0700

    Fix for not being able to draw linear and radial gradient materials.

    I'm turning off pre-flight support of gradients for WebGL since it conflicts with the materials' color support.

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

commit d0df8a2bff052d855bafb7885792b1dfff8eab7d
Merge: 2c67d26 b4b54f6
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Thu Jun 28 17:50:11 2012 -0700

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

commit 2c67d264851f0897fdca8ca887c1c82d0e434217
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Thu Jun 28 15:06:13 2012 -0700

    IKNINJA-1721 - File dirty marker does not show when modifying elements.

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

commit bb4b6a52eb75efb2f435cdb53f810ae3bc1f1fc3
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Thu Jun 28 11:15:34 2012 -0700

    IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects.

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

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

1 files changed, 12 insertions, 6 deletions

diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 33bf763d..e798d1a7 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -39,23 +39,24 @@ exports.OvalTool = Montage.create(ShapeTool, {
 
             var innerRadius = this.options.innerRadius.value / 100;
 
-            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));
@@ -95,7 +96,12 @@ exports.OvalTool = Montage.create(ShapeTool, {
             }
 
             // TODO - This needs to be moved into geom obj's init routine instead of here
-            this.setColor(this.options.stroke, this.options.fill, canvas, "ovalTool");
+            if(!fillM) {
+                this.setColor(canvas, this.options.fill, true, "ovalTool");
+            }
+            if(!strokeM) {
+                this.setColor(canvas, this.options.stroke, false, "ovalTool");
+            }
 
             if(canvas.elementModel.isShape)
             {