diff options
| author | Jonathan Duran | 2012-04-04 11:21:46 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-04 11:21:46 -0700 |
| commit | 04ca16276e73dbd238b42fd898f8b3cccc730f18 (patch) | |
| tree | 95aee6605f1018550875812166d292554830d7ca /js/tools/modifier-tool-base.js | |
| parent | 61404b1965ffe7011ec86953f853f0954ccc308d (diff) | |
| parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
| download | ninja-04ca16276e73dbd238b42fd898f8b3cccc730f18.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/tools/SelectionTool.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
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 94b806fd..46bb2e87 100755 --- a/js/tools/modifier-tool-base.js +++ b/js/tools/modifier-tool-base.js | |||
| @@ -778,7 +778,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
| 778 | { | 778 | { |
| 779 | if(len === 1) | 779 | if(len === 1) |
| 780 | { | 780 | { |
| 781 | this.target = this.application.ninja.selectedElements[0]._element; | 781 | this.target = this.application.ninja.selectedElements[0]; |
| 782 | drawUtils.addElement(this.target); | 782 | drawUtils.addElement(this.target); |
| 783 | } | 783 | } |
| 784 | else | 784 | else |