diff options
author | John Mayhew | 2012-04-04 14:41:16 -0700 |
---|---|---|
committer | John Mayhew | 2012-04-04 14:41:16 -0700 |
commit | 7249d6377c8897b2f9d8115be99717be971a0981 (patch) | |
tree | 9415f5ba25ad643df678e561719d2708fd3ead5a /js/tools/Translate3DToolBase.js | |
parent | ebdfa77a5399d245ddf134ee8110b2d046922a71 (diff) | |
parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
download | ninja-7249d6377c8897b2f9d8115be99717be971a0981.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/lib/drawing/world.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, []); |