aboutsummaryrefslogtreecommitdiff
path: root/js/tools/SelectionTool.js
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /js/tools/SelectionTool.js
parentd21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
downloadninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
Diffstat (limited to 'js/tools/SelectionTool.js')
-rwxr-xr-xjs/tools/SelectionTool.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 855c7b8c..07c26b8c 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -504,7 +504,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
504 delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 ); 504 delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 );
505 delta[0] = ~~delta[0]; 505 delta[0] = ~~delta[0];
506 delta[1] = ~~delta[1]; 506 delta[1] = ~~delta[1];
507 delta[2] = 0; 507 //delta[2] = 0;
508 var transMat = Matrix.Translation( delta ); 508 var transMat = Matrix.Translation( delta );
509 this._moveElements(transMat); 509 this._moveElements(transMat);
510 } 510 }