diff options
| author | Eric Guzman | 2012-02-29 16:13:19 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-29 16:13:19 -0800 |
| commit | 53bdb1e7773069c4cca59e88d6da91cd0f58c94a (patch) | |
| tree | 44a2147fcbb43ea483f78a1e2e082919f9c81970 /js/tools/Translate3DToolBase.js | |
| parent | b2c60efb9c6f5dfa7b0fc5c2b9feebebc805ed97 (diff) | |
| parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
| download | ninja-53bdb1e7773069c4cca59e88d6da91cd0f58c94a.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
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; |