diff options
author | hwc487 | 2012-04-04 16:32:53 -0700 |
---|---|---|
committer | hwc487 | 2012-04-04 16:32:53 -0700 |
commit | 6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600 (patch) | |
tree | f267e05f623ed90d1cc841b8c79a338d6d8e807c /js/tools/modifier-tool-base.js | |
parent | 16f62ca09cc428043e8fef8bdeea11a989e62bc0 (diff) | |
parent | 17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff) | |
download | ninja-6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping
Conflicts:
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
Diffstat (limited to 'js/tools/modifier-tool-base.js')
-rwxr-xr-x | js/tools/modifier-tool-base.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js index b6589cba..2c9b484e 100755 --- a/js/tools/modifier-tool-base.js +++ b/js/tools/modifier-tool-base.js | |||
@@ -786,7 +786,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
786 | { | 786 | { |
787 | if(len === 1) | 787 | if(len === 1) |
788 | { | 788 | { |
789 | this.target = this.application.ninja.selectedElements[0]._element; | 789 | this.target = this.application.ninja.selectedElements[0]; |
790 | drawUtils.addElement(this.target); | 790 | drawUtils.addElement(this.target); |
791 | } | 791 | } |
792 | else | 792 | else |