diff options
| author | Jonathan Duran | 2012-04-25 08:15:26 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-25 08:15:26 -0700 |
| commit | 4a717f3abdad8f65cf8e61f7308f1f89aa825884 (patch) | |
| tree | ab3a892eda4853636556ac4e67fa1ecca2f46d1d /js/tools/BrushTool.js | |
| parent | ef704fcb6b1bb290eb45b6685b073e2932237a68 (diff) | |
| parent | d3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff) | |
| download | ninja-4a717f3abdad8f65cf8e61f7308f1f89aa825884.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 34a3c3ff..94958fd6 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 | ||