aboutsummaryrefslogtreecommitdiff
path: root/js/tools/Rotate3DToolBase.js
diff options
context:
space:
mode:
authorJohn Mayhew2012-04-04 14:41:16 -0700
committerJohn Mayhew2012-04-04 14:41:16 -0700
commit7249d6377c8897b2f9d8115be99717be971a0981 (patch)
tree9415f5ba25ad643df678e561719d2708fd3ead5a /js/tools/Rotate3DToolBase.js
parentebdfa77a5399d245ddf134ee8110b2d046922a71 (diff)
parent8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff)
downloadninja-7249d6377c8897b2f9d8115be99717be971a0981.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/lib/drawing/world.js
Diffstat (limited to 'js/tools/Rotate3DToolBase.js')
-rwxr-xr-xjs/tools/Rotate3DToolBase.js4
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