diff options
| author | Jonathan Duran | 2012-07-20 08:30:24 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-07-20 08:30:24 -0700 |
| commit | 936fbd6d76d35e3f9574983682c266de6dce55f7 (patch) | |
| tree | edfbd366df9d7e7514425561a817fc2c67f398d9 /js/tools/Translate3DToolBase.js | |
| parent | 7b7f4157dfd1d3ad2b4a266c92594da56a619254 (diff) | |
| parent | 9053e2037821a5c8405fabb74db9635deacfe8d5 (diff) | |
| download | ninja-936fbd6d76d35e3f9574983682c266de6dce55f7.tar.gz | |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/tools/Translate3DToolBase.js')
| -rwxr-xr-x | js/tools/Translate3DToolBase.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js index 57a379e4..b5008666 100755 --- a/js/tools/Translate3DToolBase.js +++ b/js/tools/Translate3DToolBase.js | |||
| @@ -302,7 +302,6 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, | |||
| 302 | if(len) { | 302 | if(len) { |
| 303 | if(len === 1) { | 303 | if(len === 1) { |
| 304 | this.target = this.application.ninja.selectedElements[0]; | 304 | this.target = this.application.ninja.selectedElements[0]; |
| 305 | drawUtils.addElement(this.target); | ||
| 306 | 305 | ||
| 307 | viewUtils.pushViewportObj( this.target ); | 306 | viewUtils.pushViewportObj( this.target ); |
| 308 | var eltCtr = viewUtils.getCenterOfProjection(); | 307 | var eltCtr = viewUtils.getCenterOfProjection(); |