diff options
| author | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
| commit | bd2c28100f347afc10243c80b8a288746370eee2 (patch) | |
| tree | db507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /js/tools/PanTool.js | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/tools/PanTool.js')
| -rwxr-xr-x | js/tools/PanTool.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js index 39f89d17..a8911c0c 100755 --- a/js/tools/PanTool.js +++ b/js/tools/PanTool.js | |||
| @@ -122,7 +122,6 @@ exports.PanTool = Montage.create(toolBase, | |||
| 122 | value: function () | 122 | value: function () |
| 123 | { | 123 | { |
| 124 | var uc = this.application.ninja.currentDocument.model.documentRoot; | 124 | var uc = this.application.ninja.currentDocument.model.documentRoot; |
| 125 | //var uc = documentManagerModule.DocumentManager.activeDocument | ||
| 126 | var ucMat = viewUtils.getMatrixFromElement(uc); | 125 | var ucMat = viewUtils.getMatrixFromElement(uc); |
| 127 | 126 | ||
| 128 | var noTrans = ucMat.slice(); | 127 | var noTrans = ucMat.slice(); |