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

diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 6ff61546..3cd75be2 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -211,26 +211,16 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                 }
         },
 
-    // We can draw on an existing canvas unless it has only a single shape object
     setColor: {
-        value: function(stroke, fill, canvas, toolId)
+        value: function(canvas, color, isFill, toolId)
         {
-            if(stroke && stroke.color)
+            if(color && color.color)
             {
-                this.application.ninja.elementMediator.setColor([canvas], {mode:stroke.colorMode, color:stroke.color}, false, "Change", toolId);
+                this.application.ninja.elementMediator.setColor([canvas], {mode:color.colorMode, color:color.color}, isFill, "Change", toolId);
             }
             else
             {
-                this.application.ninja.elementMediator.setColor([canvas], {mode:"nocolor", color:null}, false, "Change", toolId);
-            }
-
-            if(fill && fill.color)
-            {
-                this.application.ninja.elementMediator.setColor([canvas], {mode:fill.colorMode, color:fill.color}, true, "Change", toolId);
-            }
-            else
-            {
-                this.application.ninja.elementMediator.setColor([canvas], {mode:"nocolor", color:null}, true, "Change", toolId);
+                this.application.ninja.elementMediator.setColor([canvas], {mode:"nocolor", color:null}, isFill, "Change", toolId);
             }
         }
     }