diff options
author | Jon Reid | 2012-04-10 14:52:23 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-10 14:52:23 -0700 |
commit | c19987997758cf47ac9b93a2a767a0e2a9072745 (patch) | |
tree | eb68491c5d04a5cf5ab75bedf2d6bbed3c7a3603 /js/tools/RotateObject3DTool.js | |
parent | 03a3b32b9b0fd2dc8e4b54bfd5282fd1f8fb6ed6 (diff) | |
parent | 422b14fc60be84c116115f2e71e3499e232f3f05 (diff) | |
download | ninja-c19987997758cf47ac9b93a2a767a0e2a9072745.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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 72af6eff..27352231 100755 --- a/js/tools/RotateObject3DTool.js +++ b/js/tools/RotateObject3DTool.js | |||
@@ -51,6 +51,7 @@ exports.RotateObject3DTool = Montage.create(Rotate3DToolBase, { | |||
51 | toolHandle._rotMat = Matrix.RotationZ( angle ); | 51 | toolHandle._rotMat = Matrix.RotationZ( angle ); |
52 | } | 52 | } |
53 | } | 53 | } |
54 | this._inLocalMode = (this.options.selectedMode === "rotateLocally"); | ||
54 | } | 55 | } |
55 | }, | 56 | }, |
56 | 57 | ||