diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-10-14 03:01:31 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-10-14 03:01:31 +0000 |
| commit | 1d2cec18d1038150b6511454a2fbb2b3cb6d36f8 (patch) | |
| tree | 38aeab42635a7ebfa0b87394e42d8bebbcdc7ce6 /src/object-snapper.cpp | |
| parent | update to trunk (r13586) (diff) | |
| parent | 2geom: Re-fix IS_NAN and IS_FINITE for solaris (diff) | |
| download | inkscape-1d2cec18d1038150b6511454a2fbb2b3cb6d36f8.tar.gz inkscape-1d2cec18d1038150b6511454a2fbb2b3cb6d36f8.zip | |
update to trunk (r13610)
(bzr r13506.1.112)
Diffstat (limited to 'src/object-snapper.cpp')
| -rw-r--r-- | src/object-snapper.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index 9ff6df3bf..2b29814b0 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -289,7 +289,7 @@ void Inkscape::ObjectSnapper::_snapNodes(IntermSnapResults &isr, for (std::vector<SnapCandidatePoint>::const_iterator k = _points_to_snap_to->begin(); k != _points_to_snap_to->end(); ++k) { if (_allowSourceToSnapToTarget(p.getSourceType(), (*k).getTargetType(), strict_snapping)) { Geom::Point target_pt = (*k).getPoint(); - Geom::Coord dist = Geom::infinity(); + Geom::Coord dist = Geom::L2(target_pt - p.getPoint()); // Default: free (unconstrained) snapping if (!c.isUndefined()) { // We're snapping to nodes along a constraint only, so find out if this node // is at the constraint, while allowing for a small margin @@ -299,9 +299,6 @@ void Inkscape::ObjectSnapper::_snapNodes(IntermSnapResults &isr, continue; } dist = Geom::L2(target_pt - p_proj_on_constraint); - } else { - // Free (unconstrained) snapping - dist = Geom::L2(target_pt - p.getPoint()); } if (dist < getSnapperTolerance() && dist < s.getSnapDistance()) { |