Merge branch 'timeline-local' into timeline-multiselect

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	resolved using theirs. (selectLayers)

1 files changed, 1 insertions, 1 deletions

diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 746f20cf..87a093ff 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -22,7 +22,7 @@ exports.FillTool = Montage.create(ModifierToolBase, {
     HandleMouseMove: {
         value : function (event)
                 {
-            var obj = this.application.ninja.stage.GetSelectableElement(event);
+            var obj = this.application.ninja.stage.getElement(event, true);
             var cursor = "url('images/cursors/fill.png') 14 14, default";
             var canColor = true;
             if (obj)