diff options
| author | Nivesh Rajbhandari | 2012-04-25 13:34:04 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-25 13:34:04 -0700 |
| commit | 32a24988add5ba0ecf80caa31871cdd90e3eea5b (patch) | |
| tree | fbf05f2dfc91e57ab9598046ff16798ea0ae1966 /js/tools/BrushTool.js | |
| parent | 60d6346a78fb5257eaf36f17a5fcb764a342c012 (diff) | |
| parent | d3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff) | |
| download | ninja-32a24988add5ba0ecf80caa31871cdd90e3eea5b.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
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 | ||