diff options
author | Ananya Sen | 2012-06-04 10:43:29 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-04 10:43:29 -0700 |
commit | 6fb29883329c9c42a8b406128b92c0e6323a47be (patch) | |
tree | 07f46e88bccf9cdb7d4e6818e1b646b0d19f05b9 /js/tools/PenTool.js | |
parent | cf097ec69e35c07ecae5a105ed5eeb78291c9ac2 (diff) | |
parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
download | ninja-6fb29883329c9c42a8b406128b92c0e6323a47be.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/tools/PenTool.js')
-rwxr-xr-x | js/tools/PenTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js index 10eb03c9..3813123a 100755 --- a/js/tools/PenTool.js +++ b/js/tools/PenTool.js | |||
@@ -428,7 +428,7 @@ exports.PenTool = Montage.create(ShapeTool, { | |||
428 | var globalMousePos=null, localMousePos=null, stageWorldMousePos = null; | 428 | var globalMousePos=null, localMousePos=null, stageWorldMousePos = null; |
429 | var drawingCanvas = this._selectedSubpath.getCanvas(); | 429 | var drawingCanvas = this._selectedSubpath.getCanvas(); |
430 | if (!drawingCanvas){ | 430 | if (!drawingCanvas){ |
431 | drawingCanvas = ViewUtils.getStageElement(); | 431 | drawingCanvas = this.application.ninja.currentDocument.model.documentRoot; |
432 | stageWorldMousePos = hitRec.calculateStageWorldPoint(); | 432 | stageWorldMousePos = hitRec.calculateStageWorldPoint(); |
433 | stageWorldMousePos[0]+= snapManager.getStageWidth()*0.5; | 433 | stageWorldMousePos[0]+= snapManager.getStageWidth()*0.5; |
434 | stageWorldMousePos[1]+= snapManager.getStageHeight()*0.5; | 434 | stageWorldMousePos[1]+= snapManager.getStageHeight()*0.5; |