diff options
author | Eric Guzman | 2012-04-30 13:48:43 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-30 13:48:43 -0700 |
commit | 23d8efd4ed9e8fd43f516595009679fb44c8096d (patch) | |
tree | 7d5be06e6417102702a49ece24fca82528aced7a /js/tools/InkBottleTool.js | |
parent | ae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
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) |