aboutsummaryrefslogtreecommitdiff
path: root/js/tools/RotateObject3DTool.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-17 14:49:18 -0700
committerPushkar Joshi2012-04-17 14:49:18 -0700
commitdf903a01e14134cadf109b733d09c6eadfa3966b (patch)
tree2351f1c05b2f852053fa0be533072088a9ad4e7c /js/tools/RotateObject3DTool.js
parent036cf034e124dbc1f4893e90f7c6d240904a3faf (diff)
parentcacb4a21825818af392c2949967b0f3c1df509c5 (diff)
downloadninja-df903a01e14134cadf109b733d09c6eadfa3966b.tar.gz
Merge branch 'master' into pentool
Conflicts: js/tools/PenTool.js
Diffstat (limited to 'js/tools/RotateObject3DTool.js')
-rwxr-xr-xjs/tools/RotateObject3DTool.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/tools/RotateObject3DTool.js b/js/tools/RotateObject3DTool.js
index 72af6eff..902cf05d 100755
--- a/js/tools/RotateObject3DTool.js
+++ b/js/tools/RotateObject3DTool.js
@@ -18,6 +18,7 @@ exports.RotateObject3DTool = Montage.create(Rotate3DToolBase, {
18 18
19 _initializeToolHandles: { 19 _initializeToolHandles: {
20 value: function() { 20 value: function() {
21 this.rotateStage = false;
21 if(!this._handles) 22 if(!this._handles)
22 { 23 {
23 this._handles = []; 24 this._handles = [];
@@ -51,6 +52,7 @@ exports.RotateObject3DTool = Montage.create(Rotate3DToolBase, {
51 toolHandle._rotMat = Matrix.RotationZ( angle ); 52 toolHandle._rotMat = Matrix.RotationZ( angle );
52 } 53 }
53 } 54 }
55 this._inLocalMode = (this.options.selectedMode === "rotateLocally");
54 } 56 }
55 }, 57 },
56 58