diff options
| author | hwc487 | 2012-04-13 11:52:13 -0700 |
|---|---|---|
| committer | hwc487 | 2012-04-13 11:52:13 -0700 |
| commit | 4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c (patch) | |
| tree | 3dc2e3c5a041179eed38eab1a00f851554e50005 /js/tools/RotateObject3DTool.js | |
| parent | 521df0ed9242efff45715998837068c87aca7efd (diff) | |
| parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
| download | ninja-4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II
Conflicts:
js/helper-classes/3D/view-utils.js
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
js/tools/Translate3DToolBase.js
Diffstat (limited to 'js/tools/RotateObject3DTool.js')
| -rwxr-xr-x | js/tools/RotateObject3DTool.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/tools/RotateObject3DTool.js b/js/tools/RotateObject3DTool.js index 7b4ec083..25de0cd1 100755 --- a/js/tools/RotateObject3DTool.js +++ b/js/tools/RotateObject3DTool.js | |||
| @@ -53,6 +53,7 @@ exports.RotateObject3DTool = Montage.create(Rotate3DToolBase, { | |||
| 53 | toolHandle._rotMat = Matrix.RotationZ( angle ); | 53 | toolHandle._rotMat = Matrix.RotationZ( angle ); |
| 54 | } | 54 | } |
| 55 | } | 55 | } |
| 56 | this._inLocalMode = (this.options.selectedMode === "rotateLocally"); | ||
| 56 | } | 57 | } |
| 57 | }, | 58 | }, |
| 58 | 59 | ||