aboutsummaryrefslogtreecommitdiff
path: root/js/tools/SelectionTool.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-16 21:03:58 -0700
committerJose Antonio Marquez2012-03-16 21:03:58 -0700
commit415bab69cca4e8511144407b67bec80f2ba95422 (patch)
treec336ca8ae1bcd6761c924bacf8bfe7143b2c7885 /js/tools/SelectionTool.js
parente7e18f02870a0cfe06e550acf8ffef6eab945231 (diff)
parent954f5a13e371febcb1c0fb8015c577ee51c23130 (diff)
downloadninja-415bab69cca4e8511144407b67bec80f2ba95422.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/tools/SelectionTool.js')
-rwxr-xr-xjs/tools/SelectionTool.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 5f48f74d..f9411f48 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -205,12 +205,12 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
205 { 205 {
206 this._handleMode = null; 206 this._handleMode = null;
207 this._delta = null; 207 this._delta = null;
208 this.DrawHandles();
209 } 208 }
210 209
211 this.endDraw(event); 210 this.endDraw(event);
212 this._canSnap = true; 211 this._canSnap = true;
213 this._use3DMode = false; 212 this._use3DMode = false;
213 this.DrawHandles();
214 } 214 }
215 }, 215 },
216 216
@@ -577,6 +577,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
577 { 577 {
578 // form the translation vector and post translate the matrix by it. 578 // form the translation vector and post translate the matrix by it.
579 delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 ); 579 delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 );
580 delta[2] = 0;
580 var transMat = Matrix.Translation( delta ); 581 var transMat = Matrix.Translation( delta );
581 this._moveElements(transMat); 582 this._moveElements(transMat);
582 } 583 }
@@ -710,7 +711,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
710 { 711 {
711 return; 712 return;
712 } 713 }
713 if(this._target && this._handles) 714 if(this._target && this._handles && (this._targets.length === 1))
714 { 715 {
715 var len = this._handles.length; 716 var len = this._handles.length;
716 var i = 0, 717 var i = 0,