diff options
| author | Ananya Sen | 2012-04-26 12:57:56 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-04-26 12:57:56 -0700 |
| commit | b2132103b12e499f26e6e0f311d48555a9f733ff (patch) | |
| tree | 2eaa000b460e4be3c8050a369318584b2591e8d7 /js/tools/BrushTool.js | |
| parent | 07c611323c109aaa2208ebc15a354b81c3f04a0d (diff) | |
| parent | 902dc18296fc78f3b8e67d952c42981d926bb2fc (diff) | |
| download | ninja-b2132103b12e499f26e6e0f311d48555a9f733ff.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/tools/BrushTool.js')
| -rw-r--r-- | js/tools/BrushTool.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js index 4347658a..6cd6858c 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js | |||
| @@ -134,7 +134,6 @@ exports.BrushTool = Montage.create(ShapeTool, { | |||
| 134 | snapManager.enableSnapAlign(false); | 134 | snapManager.enableSnapAlign(false); |
| 135 | 135 | ||
| 136 | var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(x,y)); | 136 | var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(x,y)); |
| 137 | //todo fix this function to allow us to get the correct location (in 3D) for the mouse position | ||
| 138 | var unsnappedpos = DrawingToolBase.getHitRecPos(snapManager.snap(point.x, point.y, false)); | 137 | var unsnappedpos = DrawingToolBase.getHitRecPos(snapManager.snap(point.x, point.y, false)); |
| 139 | this._draggingPlane = snapManager.getDragPlane(); | 138 | this._draggingPlane = snapManager.getDragPlane(); |
| 140 | 139 | ||