summaryrefslogtreecommitdiffstats
path: root/src/object-snapper.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mail@diedenrezi.nl>2011-08-28 13:03:49 +0000
committerDiederik van Lierop <mail@diedenrezi.nl>2011-08-28 13:03:49 +0000
commitf07487e34701b93421a2f92b4ad8d308d5a8bace (patch)
tree6b84b2f72b3c090abe5c5af7c086615b3f40bd43 /src/object-snapper.cpp
parentFilters. More cleanup, and some forgotten strings made translatable (thanks t... (diff)
downloadinkscape-f07487e34701b93421a2f92b4ad8d308d5a8bace.tar.gz
inkscape-f07487e34701b93421a2f92b4ad8d308d5a8bace.zip
Fix bug related to snapping to path intersections
(bzr r10587)
Diffstat (limited to 'src/object-snapper.cpp')
-rw-r--r--src/object-snapper.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index 5bb7f0d00..987b027b0 100644
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -502,8 +502,9 @@ void Inkscape::ObjectSnapper::_snapPaths(SnappedConstraints &sc,
}
}
- int num_path = 0;
- int num_segm = 0;
+ int num_path = 0; // _paths_to_snap_to contains multiple path_vectors, each containing multiple paths.
+ // num_path will count the paths, and will not be zeroed for each path_vector. It will
+ // continue counting
bool strict_snapping = _snapmanager->snapprefs.getStrictSnapping();
@@ -549,13 +550,12 @@ void Inkscape::ObjectSnapper::_snapPaths(SnappedConstraints &sc,
if (!being_edited || (c1 && c2)) {
Geom::Coord const dist = Geom::distance(sp_doc, p_doc);
if (dist < getSnapperTolerance()) {
- sc.curves.push_back(SnappedCurve(sp_dt, num_path, num_segm, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), false, curve, p.getSourceType(), p.getSourceNum(), it_p->target_type, it_p->target_bbox));
+ sc.curves.push_back(SnappedCurve(sp_dt, num_path, index, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), false, curve, p.getSourceType(), p.getSourceNum(), it_p->target_type, it_p->target_bbox));
}
}
}
- num_segm++;
+ num_path++;
} // End of: for (Geom::PathVector::iterator ....)
- num_path++;
}
}
}