diff options
| author | Eric Guzman | 2012-04-26 03:16:50 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-26 03:16:50 -0700 |
| commit | 110aa15b48ec24063815aa3b86c7f8f041543a02 (patch) | |
| tree | d0debb235807dd73f48e0793a73d37cc41ecf59c /js/tools/BrushTool.js | |
| parent | 143105a0b9c7765898b22d53489b4bd8df3dff2e (diff) | |
| parent | bcc8f8616f5ad4bf310928da6cbc01da12f6e468 (diff) | |
| download | ninja-110aa15b48ec24063815aa3b86c7f8f041543a02.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
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 | ||