diff options
author | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
commit | bd2c28100f347afc10243c80b8a288746370eee2 (patch) | |
tree | db507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /js/tools/RotateStage3DTool.js | |
parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
download | ninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/tools/RotateStage3DTool.js')
-rwxr-xr-x | js/tools/RotateStage3DTool.js | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js index 12b21a64..9e117837 100755 --- a/js/tools/RotateStage3DTool.js +++ b/js/tools/RotateStage3DTool.js | |||
@@ -85,6 +85,12 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, { | |||
85 | } | 85 | } |
86 | }, | 86 | }, |
87 | 87 | ||
88 | captureSelectionChange: { | ||
89 | value: function(event){ | ||
90 | this.eventManager.addEventListener("selectionDrawn", this, true); | ||
91 | } | ||
92 | }, | ||
93 | |||
88 | captureSelectionDrawn: { | 94 | captureSelectionDrawn: { |
89 | value: function(event){ | 95 | value: function(event){ |
90 | this._origin = null; | 96 | this._origin = null; |
@@ -114,6 +120,11 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, { | |||
114 | this._origin = viewUtils.localToGlobal(eltCtr, stage); | 120 | this._origin = viewUtils.localToGlobal(eltCtr, stage); |
115 | this._setTransformOrigin(false); | 121 | this._setTransformOrigin(false); |
116 | this.DrawHandles(); | 122 | this.DrawHandles(); |
123 | |||
124 | if(event) | ||
125 | { | ||
126 | this.eventManager.removeEventListener("selectionDrawn", this, true); | ||
127 | } | ||
117 | } | 128 | } |
118 | }, | 129 | }, |
119 | 130 | ||