diff options
| author | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
| commit | f1d75e5b29661abc4e173adc1f9de2e0cd91df83 (patch) | |
| tree | 796931014054ad6b0647854183f632ffd72ed9ee /js/tools/PanTool.js | |
| parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-f1d75e5b29661abc4e173adc1f9de2e0cd91df83.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
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(); |