diff options
author | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
commit | 4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch) | |
tree | c5b17297aba04bd54a59cf6214d29486e089031b /js/tools/Rotate3DToolBase.js | |
parent | 75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff) | |
parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
download | ninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/tools/Rotate3DToolBase.js')
-rwxr-xr-x | js/tools/Rotate3DToolBase.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js index 4fa8657e..bf9537dd 100755 --- a/js/tools/Rotate3DToolBase.js +++ b/js/tools/Rotate3DToolBase.js | |||
@@ -32,7 +32,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
32 | 32 | ||
33 | var selectedElements = this.application.ninja.selectedElements; | 33 | var selectedElements = this.application.ninja.selectedElements; |
34 | if(this.rotateStage) { | 34 | if(this.rotateStage) { |
35 | selectedElements = [this.application.ninja.currentDocument.documentRoot]; | 35 | selectedElements = [this.application.ninja.currentDocument.model.documentRoot]; |
36 | } | 36 | } |
37 | 37 | ||
38 | this._mouseDownHitRec = null; | 38 | this._mouseDownHitRec = null; |
@@ -225,7 +225,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
225 | 225 | ||
226 | var selectedElements = this.application.ninja.selectedElements; | 226 | var selectedElements = this.application.ninja.selectedElements; |
227 | if(this.rotateStage) { | 227 | if(this.rotateStage) { |
228 | selectedElements = [this.application.ninja.currentDocument.documentRoot]; | 228 | selectedElements = [this.application.ninja.currentDocument.model.documentRoot]; |
229 | } | 229 | } |
230 | 230 | ||
231 | if(this._handleMode !== null) | 231 | if(this._handleMode !== null) |
@@ -345,7 +345,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
345 | var selectedElements = this.application.ninja.selectedElements; | 345 | var selectedElements = this.application.ninja.selectedElements; |
346 | 346 | ||
347 | if(this.rotateStage) { | 347 | if(this.rotateStage) { |
348 | selectedElements = [this.application.ninja.currentDocument.documentRoot]; | 348 | selectedElements = [this.application.ninja.currentDocument.model.documentRoot]; |
349 | } | 349 | } |
350 | var len = selectedElements.length; | 350 | var len = selectedElements.length; |
351 | for(var i = 0; i < len; i++) { | 351 | for(var i = 0; i < len; i++) { |
@@ -481,7 +481,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
481 | } | 481 | } |
482 | else | 482 | else |
483 | { | 483 | { |
484 | this.target = this.application.ninja.currentDocument.documentRoot; | 484 | this.target = this.application.ninja.currentDocument.model.documentRoot; |
485 | //this._origin = drawUtils._selectionCtr.slice(0); | 485 | //this._origin = drawUtils._selectionCtr.slice(0); |
486 | //this._origin[0] += this.application.ninja.stage.userContentLeft; | 486 | //this._origin[0] += this.application.ninja.stage.userContentLeft; |
487 | //this._origin[1] += this.application.ninja.stage.userContentTop; | 487 | //this._origin[1] += this.application.ninja.stage.userContentTop; |
@@ -609,7 +609,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
609 | 609 | ||
610 | if(this.rotateStage || (this.application.ninja.selectedElements.length === 1)) { | 610 | if(this.rotateStage || (this.application.ninja.selectedElements.length === 1)) { |
611 | if(this.rotateStage) { | 611 | if(this.rotateStage) { |
612 | element = this.application.ninja.currentDocument.documentRoot; | 612 | element = this.application.ninja.currentDocument.model.documentRoot; |
613 | } else { | 613 | } else { |
614 | element = this.application.ninja.selectedElements[0]; | 614 | element = this.application.ninja.selectedElements[0]; |
615 | } | 615 | } |
@@ -851,7 +851,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
851 | else | 851 | else |
852 | { | 852 | { |
853 | lMode = false; | 853 | lMode = false; |
854 | viewUtils.pushViewportObj( this.application.ninja.currentDocument.documentRoot ); | 854 | viewUtils.pushViewportObj( this.application.ninja.currentDocument.model.documentRoot ); |
855 | } | 855 | } |
856 | var base = this._origin; | 856 | var base = this._origin; |
857 | //console.log( "Rotate3DToolBase.DrawHandles, base: " + base ); | 857 | //console.log( "Rotate3DToolBase.DrawHandles, base: " + base ); |