diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-29 16:45:16 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-29 16:45:16 +0000 |
| commit | 201523932d960706a6910e19ed7cc760d1463cb0 (patch) | |
| tree | 048e4fe81625654d48b6d0657582a26ca8aedf26 /src/live_effects/parameter/satellitesarray.cpp | |
| parent | cmake/MSYS2: Fix fontconfig's conf.d/ not being installed (diff) | |
| download | inkscape-201523932d960706a6910e19ed7cc760d1463cb0.tar.gz inkscape-201523932d960706a6910e19ed7cc760d1463cb0.zip | |
Fix a bug pointed by CR on delete nodes in fillet/chamfer LPE
Diffstat (limited to 'src/live_effects/parameter/satellitesarray.cpp')
| -rw-r--r-- | src/live_effects/parameter/satellitesarray.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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()); } |
