diff options
author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/tools/InkBottleTool.js | |
parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/tools/InkBottleTool.js')
-rwxr-xr-x | js/tools/InkBottleTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js index 960c19fa..fd17f4d6 100755 --- a/js/tools/InkBottleTool.js +++ b/js/tools/InkBottleTool.js | |||
@@ -16,7 +16,7 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, { | |||
16 | HandleMouseMove: { | 16 | HandleMouseMove: { |
17 | value : function (event) | 17 | value : function (event) |
18 | { | 18 | { |
19 | var obj = this.application.ninja.stage.GetSelectableElement(event); | 19 | var obj = this.application.ninja.stage.getElement(event, true); |
20 | var cursor = "url('images/cursors/ink.png') 6 11, default"; | 20 | var cursor = "url('images/cursors/ink.png') 6 11, default"; |
21 | var canColor = true; | 21 | var canColor = true; |
22 | if (obj) | 22 | if (obj) |