diff options
author | Pushkar Joshi | 2012-04-04 15:55:48 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-04 15:55:48 -0700 |
commit | 0681b34b506767b6caf2816b9096bc1a57a17a2d (patch) | |
tree | 20f10c767efe8d9c5c38fbc2cdb713d093bb279d /js/tools/Rotate3DToolBase.js | |
parent | f4eccf3e7cb76a14a3546a646575162dbd831538 (diff) | |
parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
download | ninja-0681b34b506767b6caf2816b9096bc1a57a17a2d.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
Diffstat (limited to 'js/tools/Rotate3DToolBase.js')
-rwxr-xr-x | js/tools/Rotate3DToolBase.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js index b04e8b0a..eb2cdba4 100755 --- a/js/tools/Rotate3DToolBase.js +++ b/js/tools/Rotate3DToolBase.js | |||
@@ -262,7 +262,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
262 | { | 262 | { |
263 | if(len === 1) | 263 | if(len === 1) |
264 | { | 264 | { |
265 | this.target = this.application.ninja.selectedElements[0]._element; | 265 | this.target = this.application.ninja.selectedElements[0]; |
266 | drawUtils.addElement(this.target); | 266 | drawUtils.addElement(this.target); |
267 | 267 | ||
268 | viewUtils.pushViewportObj( this.target ); | 268 | viewUtils.pushViewportObj( this.target ); |
@@ -311,7 +311,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
311 | this._targets = []; | 311 | this._targets = []; |
312 | for(var i = 0; i < len; i++) | 312 | for(var i = 0; i < len; i++) |
313 | { | 313 | { |
314 | var elt = this.application.ninja.selectedElements[i]._element; | 314 | var elt = this.application.ninja.selectedElements[i]; |
315 | // this._initProps3D(elt); | 315 | // this._initProps3D(elt); |
316 | 316 | ||
317 | 317 | ||