diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-09-21 21:12:27 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-09-21 21:12:27 +0000 |
| commit | a474159bf7130e9b46a8da1efaf32e9eac4c55b7 (patch) | |
| tree | 5a7966a4b2f6c8a30fa6772a383d0d826775e275 /src/live_effects/lpe-fill-between-many.cpp | |
| parent | Update expected renderings. (diff) | |
| download | inkscape-a474159bf7130e9b46a8da1efaf32e9eac4c55b7.tar.gz inkscape-a474159bf7130e9b46a8da1efaf32e9eac4c55b7.zip | |
Fix for bug #1715433 Clone original LPE can no longer be used to fill a powerstroke path
Diffstat (limited to 'src/live_effects/lpe-fill-between-many.cpp')
| -rw-r--r-- | src/live_effects/lpe-fill-between-many.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/live_effects/lpe-fill-between-many.cpp b/src/live_effects/lpe-fill-between-many.cpp index e380ca2dd..7e2131f76 100644 --- a/src/live_effects/lpe-fill-between-many.cpp +++ b/src/live_effects/lpe-fill-between-many.cpp @@ -22,16 +22,16 @@ namespace Inkscape { namespace LivePathEffect { static const Util::EnumData<Filllpemethod> FilllpemethodData[] = { - { FLM_NONE, N_("Without LPE"), "none" }, - { FLM_PARTIAL, N_("Spiro/BSpline"), "partial" }, - { FLM_ALL, N_("All LPE"), "all" } + { FLM_ORIGINALD, N_("Without LPE's"), "originald" }, + { FLM_BSPLINESPIRO, N_("With Spiro or BSpline"), "bsplinespiro" }, + { FLM_D, N_("With LPE's"), "d" } }; static const Util::EnumDataConverter<Filllpemethod> FLMConverter(FilllpemethodData, FLM_END); LPEFillBetweenMany::LPEFillBetweenMany(LivePathEffectObject *lpeobject) : Effect(lpeobject), linked_paths(_("Linked path:"), _("Paths from which to take the original path data"), "linkedpaths", &wr, this), - method(_("LPE's on linked:"), _("LPE's on linked"), "method", FLMConverter, &wr, this, FLM_PARTIAL), + method(_("LPE's on linked:"), _("LPE's on linked"), "method", FLMConverter, &wr, this, FLM_BSPLINESPIRO), fuse(_("Fuse coincident points"), _("Fuse coincident points"), "fuse", &wr, this, false), allow_transforms(_("Allow transforms"), _("Allow transforms"), "allow_transforms", &wr, this, false), join(_("Join subpaths"), _("Join subpaths"), "join", &wr, this, true), @@ -104,10 +104,10 @@ void LPEFillBetweenMany::doOnApply (SPLPEItem const* lpeitem) void LPEFillBetweenMany::doEffect (SPCurve * curve) { if (previous_method != method) { - if (method == FLM_PARTIAL) { + if (method == FLM_BSPLINESPIRO) { linked_paths.allowOnlyBsplineSpiro(true); linked_paths.setFromOriginalD(false); - } else if(method == FLM_NONE) { + } else if(method == FLM_ORIGINALD) { linked_paths.allowOnlyBsplineSpiro(false); linked_paths.setFromOriginalD(true); } else { |