diff options
| author | Pushkar Joshi | 2012-04-04 15:55:48 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-04 15:55:48 -0700 |
| commit | 0681b34b506767b6caf2816b9096bc1a57a17a2d (patch) | |
| tree | 20f10c767efe8d9c5c38fbc2cdb713d093bb279d /js/tools/Translate3DToolBase.js | |
| parent | f4eccf3e7cb76a14a3546a646575162dbd831538 (diff) | |
| parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
| download | ninja-0681b34b506767b6caf2816b9096bc1a57a17a2d.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
Diffstat (limited to 'js/tools/Translate3DToolBase.js')
| -rwxr-xr-x | js/tools/Translate3DToolBase.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js index 07b6d04d..4dca6313 100755 --- a/js/tools/Translate3DToolBase.js +++ b/js/tools/Translate3DToolBase.js | |||
| @@ -195,7 +195,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, | |||
| 195 | this._targets = []; | 195 | this._targets = []; |
| 196 | for(var i = 0; i < len; i++) | 196 | for(var i = 0; i < len; i++) |
| 197 | { | 197 | { |
| 198 | var elt = this.application.ninja.selectedElements[i]._element; | 198 | var elt = this.application.ninja.selectedElements[i]; |
| 199 | 199 | ||
| 200 | var curMat = viewUtils.getMatrixFromElement(elt); | 200 | var curMat = viewUtils.getMatrixFromElement(elt); |
| 201 | var curMatInv = glmat4.inverse(curMat, []); | 201 | var curMatInv = glmat4.inverse(curMat, []); |