From 201523932d960706a6910e19ed7cc760d1463cb0 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 29 Jul 2017 18:45:16 +0200 Subject: Fix a bug pointed by CR on delete nodes in fillet/chamfer LPE --- src/live_effects/parameter/satellitesarray.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/live_effects/parameter/satellitesarray.cpp') diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp index ce4da243e..6b50f8c09 100644 --- a/src/live_effects/parameter/satellitesarray.cpp +++ b/src/live_effects/parameter/satellitesarray.cpp @@ -107,8 +107,9 @@ void SatellitesArrayParam::updateCanvasIndicators(bool mirror) if (_vector[i][j].hidden || //Ignore if hidden (!_vector[i][j].has_mirror && mirror == true) || //Ignore if not have mirror and we are in mirror loop _vector[i][j].amount == 0 || //no helper in 0 value - pathv[i].size() == j || //ignore last satellite in open paths with fillet chamfer effect - (!pathv[i].closed() && j == 0)) //ignore first satellites on open paths + j >= pathv[i].size() || //ignore last satellite in open paths with fillet chamfer effect + (!pathv[i].closed() && j == 0) || //ignore first satellites on open paths + pathv[i].size() == 2) { continue; } @@ -388,7 +389,7 @@ Geom::Point FilletChamferKnotHolderEntity::knot_get() const Geom::PathVector pathv = _pparam->_last_pathvector_satellites->getPathVector(); if (satellite.hidden || (!pathv[path_index].closed() && curve_index == 0) ||//ignore first satellites on open paths - pathv[path_index].size() == curve_index) //ignore last satellite in open paths with fillet chamfer effect + curve_index >= pathv[path_index].size()) { return Geom::Point(Geom::infinity(), Geom::infinity()); } -- cgit v1.2.3