diff options
| author | Ananya Sen | 2012-02-29 15:21:31 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-29 15:21:31 -0800 |
| commit | 8fee7d6bdb55ba18f396c3523081b18499fa1e30 (patch) | |
| tree | dbd17232983247a38bb6b2cea480242bdf3f2422 /js/tools/Translate3DToolBase.js | |
| parent | 5d4f1aad01737695238582c704e6d4f2c3a2f317 (diff) | |
| parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
| download | ninja-8fee7d6bdb55ba18f396c3523081b18499fa1e30.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into FileIO
Conflicts:
js/controllers/selection-controller.js
js/document/html-document.js
js/panels/properties/content.reel/content.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/tools/Translate3DToolBase.js')
| -rwxr-xr-x | js/tools/Translate3DToolBase.js | 1 |
1 files changed, 0 insertions, 1 deletions
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; |