summaryrefslogtreecommitdiffstats
path: root/src/ui/tool/path-manipulator.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2015-05-08 06:29:58 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2015-05-08 06:29:58 +0000
commite110371c4d69ea0a407d7500b156cf373109787b (patch)
tree7c575b0576389731bd7758766986dc56f3aeccf6 /src/ui/tool/path-manipulator.cpp
parentUpdate 2Geom to r2347 (diff)
downloadinkscape-e110371c4d69ea0a407d7500b156cf373109787b.tar.gz
inkscape-e110371c4d69ea0a407d7500b156cf373109787b.zip
Fix node editing problems
(bzr r14059.2.4)
Diffstat (limited to 'src/ui/tool/path-manipulator.cpp')
-rw-r--r--src/ui/tool/path-manipulator.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index e54764216..bbedb8263 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -1148,15 +1148,15 @@ void PathManipulator::_createControlPointsFromGeometry()
Node *previous_node = new Node(_multi_path_manipulator._path_data.node_data, pit->initialPoint());
subpath->push_back(previous_node);
- Geom::Curve const &cseg = pit->back_closed();
- bool fuse_ends = pit->closed()
- && Geom::are_near(cseg.initialPoint(), cseg.finalPoint());
- for (Geom::Path::iterator cit = pit->begin(); cit != pit->end_open(); ++cit) {
+
+ bool closed = pit->closed();
+
+ for (Geom::Path::iterator cit = pit->begin(); cit != pit->end(); ++cit) {
Geom::Point pos = cit->finalPoint();
Node *current_node;
// if the closing segment is degenerate and the path is closed, we need to move
// the handle of the first node instead of creating a new one
- if (fuse_ends && cit == --(pit->end_open())) {
+ if (closed && cit == --(pit->end())) {
current_node = subpath->begin().get_pointer();
} else {
/* regardless of segment type, create a new node at the end