aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-28 13:17:55 -0800
committerValerio Virgillito2012-02-28 13:17:55 -0800
commite5b1102f0cff7f5ba7074840ccf29dc1c02ced8e (patch)
tree3228242a101b366b1282a0c96651db0e52760e34 /js/tools
parent7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
parenta70c62891d0c7dd032d9382c50d1555ab81c4e33 (diff)
downloadninja-e5b1102f0cff7f5ba7074840ccf29dc1c02ced8e.tar.gz
Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into integration-candidate
Diffstat (limited to 'js/tools')
-rwxr-xr-xjs/tools/Rotate3DToolBase.js11
-rwxr-xr-xjs/tools/Translate3DToolBase.js1
2 files changed, 4 insertions, 8 deletions
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index aa91b2f4..b04e8b0a 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -447,16 +447,13 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
447 iMat; 447 iMat;
448 for(var i = 0; i < len; i++) 448 for(var i = 0; i < len; i++)
449 { 449 {
450 // Reset to the identity matrix but retain the rotation values 450 // Reset to the identity matrix
451 item = this._targets[i]; 451 item = this._targets[i];
452 elt = item.elt;
453
454 // Reset to the identity matrix but retain the translation values
455 iMat = Matrix.I(4); 452 iMat = Matrix.I(4);
456 mat = item.mat; 453 mat = item.mat;
457 iMat[12] = mat[12]; 454// iMat[12] = mat[12];
458 iMat[13] = mat[13]; 455// iMat[13] = mat[13];
459 iMat[14] = mat[14]; 456// iMat[14] = mat[14];
460 457
461 dist = this._undoArray[i].dist; 458 dist = this._undoArray[i].dist;
462 459
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index cbf76830..3d9191da 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -85,7 +85,6 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
85 { 85 {
86 // Reset to the identity matrix but retain the rotation values 86 // Reset to the identity matrix but retain the rotation values
87 item = this._targets[i]; 87 item = this._targets[i];
88 elt = item.elt;
89 mat = item.mat.slice(0); 88 mat = item.mat.slice(0);
90 mat[12] = 0; 89 mat[12] = 0;
91 mat[13] = 0; 90 mat[13] = 0;