diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2012-10-14 18:06:40 +0000 |
|---|---|---|
| committer | Diederik van Lierop <mail@diedenrezi.nl> | 2012-10-14 18:06:40 +0000 |
| commit | c524e974852c8bb0a356353e23702be96fff9b83 (patch) | |
| tree | 912dc655cad52123664b499d80e0ae0033509d26 /src/live_effects/parameter/powerstrokepointarray.cpp | |
| parent | Remove invalid return statements (diff) | |
| download | inkscape-c524e974852c8bb0a356353e23702be96fff9b83.tar.gz inkscape-c524e974852c8bb0a356353e23702be96fff9b83.zip | |
Fix "shift disables snapping" for LPEs and for editing objects
Fixed bugs:
- https://launchpad.net/bugs/1065931
(bzr r11800)
Diffstat (limited to '')
| -rw-r--r-- | src/live_effects/parameter/powerstrokepointarray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/live_effects/parameter/powerstrokepointarray.cpp b/src/live_effects/parameter/powerstrokepointarray.cpp index 68d0175ca..93161ec0d 100644 --- a/src/live_effects/parameter/powerstrokepointarray.cpp +++ b/src/live_effects/parameter/powerstrokepointarray.cpp @@ -144,7 +144,7 @@ PowerStrokePointArrayParamKnotHolderEntity::PowerStrokePointArrayParamKnotHolder } void -PowerStrokePointArrayParamKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) +PowerStrokePointArrayParamKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { using namespace Geom; @@ -156,7 +156,7 @@ PowerStrokePointArrayParamKnotHolderEntity::knot_set(Geom::Point const &p, Geom: Piecewise<D2<SBasis> > const & pwd2 = _pparam->get_pwd2(); Piecewise<D2<SBasis> > const & n = _pparam->get_pwd2_normal(); - Geom::Point const s = snap_knot_position(p); + Geom::Point const s = snap_knot_position(p, state); double t = nearest_point(s, pwd2); double offset = dot(s - pwd2.valueAt(t), n.valueAt(t)); _pparam->_vector.at(_index) = Geom::Point(t, offset); |
