diff options
author | Nivesh Rajbhandari | 2012-06-19 15:42:31 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-19 15:42:31 -0700 |
commit | a0d18963d746e410511c29edd32bc1775d2d5851 (patch) | |
tree | 45697f87f76e5fed14d527cc74442ff1167e115a /js/tools/modifier-tool-base.js | |
parent | 965557ffb8e11918ebc1215738a8a9657a172a84 (diff) | |
download | ninja-a0d18963d746e410511c29edd32bc1775d2d5851.tar.gz |
IKNINJA-1519 - Transform tool does not transform objects correctly in 3D space or in Top/Side view.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools/modifier-tool-base.js')
-rwxr-xr-x | js/tools/modifier-tool-base.js | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js index 6c569f0a..14a7e619 100755 --- a/js/tools/modifier-tool-base.js +++ b/js/tools/modifier-tool-base.js | |||
@@ -21,7 +21,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
21 | //------------------------------------------------------------------------- | 21 | //------------------------------------------------------------------------- |
22 | // Snapping-specific properties | 22 | // Snapping-specific properties |
23 | _canSnap: { value: true }, | 23 | _canSnap: { value: true }, |
24 | _dragPlane: { value: null }, | ||
25 | _snapParam: { value: null }, | 24 | _snapParam: { value: null }, |
26 | _snapIndex: { value: -1 }, | 25 | _snapIndex: { value: -1 }, |
27 | _useQuadPt: { value: false }, | 26 | _useQuadPt: { value: false }, |
@@ -163,15 +162,15 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
163 | 162 | ||
164 | if(!this._dragPlane) | 163 | if(!this._dragPlane) |
165 | { | 164 | { |
166 | // if( this._inLocalMode && (this._startMatArray.length === 1) ) | 165 | if((this._handleMode !== null) && (this.application.ninja.toolsData.selectedTool.action === "SelectionTool")) |
167 | // { | 166 | { |
168 | // this._dragPlane = viewUtils.getUnprojectedElementPlane(this._clickedObject); | 167 | this._dragPlane = viewUtils.getUnprojectedElementPlane(this.application.ninja.selectedElements[0]); |
169 | // snapManager.setupDragPlaneFromPlane(this._dragPlane); | 168 | snapManager.setupDragPlaneFromPlane(this._dragPlane); |
170 | // } | 169 | } |
171 | // else | 170 | else |
172 | // { | 171 | { |
173 | this._dragPlane = snapManager.setupDragPlanes( hitRec, true ); | 172 | this._dragPlane = snapManager.setupDragPlanes( hitRec, true ); |
174 | // } | 173 | } |
175 | } | 174 | } |
176 | 175 | ||
177 | // only do quadrant snapping if the 4 corners of the element are in the drag plane | 176 | // only do quadrant snapping if the 4 corners of the element are in the drag plane |