diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-10-12 15:59:21 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-10-12 15:59:21 +0000 |
| commit | acb22a496132ae58d7a500b4f92e16786d8a27c9 (patch) | |
| tree | a7bc9f7f025cef393313da4743ffb90c57f3d650 /src/object-snapper.cpp | |
| parent | noop: remove duplicate assignment in sp-lpe-item.cpp (diff) | |
| download | inkscape-acb22a496132ae58d7a500b4f92e16786d8a27c9.tar.gz inkscape-acb22a496132ae58d7a500b4f92e16786d8a27c9.zip | |
object-snapper.cpp : make the logic easier to read (use else-clause as default initialization value)
(bzr r13601)
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()) { |