summaryrefslogtreecommitdiffstats
path: root/src/live_effects/parameter/satellitesarray.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-06-12 14:33:27 +0000
committerjabiertxof <info@marker.es>2016-06-12 14:33:27 +0000
commit7e1183de6ed51ff730915fe936e2bb607dd72f33 (patch)
treea8e4d16259d2ce0c86e298bd06cf746bc7a2a323 /src/live_effects/parameter/satellitesarray.cpp
parentupdate to trunk (diff)
downloadinkscape-7e1183de6ed51ff730915fe936e2bb607dd72f33.tar.gz
inkscape-7e1183de6ed51ff730915fe936e2bb607dd72f33.zip
Fix bug consecutive nodes at same position
(bzr r13645.1.152)
Diffstat (limited to 'src/live_effects/parameter/satellitesarray.cpp')
-rw-r--r--src/live_effects/parameter/satellitesarray.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp
index e61aaf38d..db7cf80c0 100644
--- a/src/live_effects/parameter/satellitesarray.cpp
+++ b/src/live_effects/parameter/satellitesarray.cpp
@@ -33,6 +33,7 @@ SatellitesArrayParam::SatellitesArrayParam(const Glib::ustring &label,
_knot_color = 0xAAFF8800;
_helper_size = 0;
_use_distance = false;
+ _global_knot_hide = false;
_effectType = FILLET_CHAMFER;
_last_pathvector_satellites = NULL;
}
@@ -57,6 +58,10 @@ void SatellitesArrayParam::setUseDistance(bool use_knot_distance)
_use_distance = use_knot_distance;
}
+void SatellitesArrayParam::setGlobalKnotHide(bool global_knot_hide)
+{
+ _global_knot_hide = global_knot_hide;
+}
void SatellitesArrayParam::setEffectType(EffectType et)
{
_effectType = et;
@@ -331,7 +336,7 @@ void FilletChamferKnotHolderEntity::knot_set(Geom::Point const &p,
Geom::Point FilletChamferKnotHolderEntity::knot_get() const
{
- if (!_pparam->_last_pathvector_satellites) {
+ if (!_pparam->_last_pathvector_satellites || _pparam->_global_knot_hide) {
return Geom::Point(Geom::infinity(), Geom::infinity());
}
Geom::Point tmp_point;