Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

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

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 87a093ff..66dd9305 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -72,9 +72,9 @@ exports.FillTool = Montage.create(ModifierToolBase, {
         value: function(event) {
             this.isDrawing = true;
 
-            if(this._canColor && this.application.ninja.selectedElements.length)
-            {
-                var color = this.application.ninja.colorController.colorToolbar.fill,
+            if(this._canColor && this.application.ninja.selectedElements.length) {
+
+                var color = this.options.fill,
                     colorInfo;
                 if(color && color.color)
                 {
@@ -92,5 +92,4 @@ exports.FillTool = Montage.create(ModifierToolBase, {
             }
         }
     }
-
 });
\ No newline at end of file