Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 15 insertions, 1 deletions

diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 8d381711..3cd75be2 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -209,7 +209,21 @@ exports.ShapeTool = Montage.create(DrawingTool, {
 
                         return target;
                 }
-        }
+        },
+
+    setColor: {
+        value: function(canvas, color, isFill, toolId)
+        {
+            if(color && color.color)
+            {
+                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}, isFill, "Change", toolId);
+            }
+        }
+    }
 
 });