diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-19 20:10:36 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-19 20:10:36 +0000 |
| commit | 968cf01eb9a0b5248a91a697c502383e8dd7b00d (patch) | |
| tree | 63eaa397c29b2a562c585b1e924feb7c8e0f2329 /src/live_effects/effect.cpp | |
| parent | Start fixing Krzysztof review (diff) | |
| parent | Merge lp:~inkscape.dev/inkscape/copy-rotate-lpe-improvements (diff) | |
| download | inkscape-968cf01eb9a0b5248a91a697c502383e8dd7b00d.tar.gz inkscape-968cf01eb9a0b5248a91a697c502383e8dd7b00d.zip | |
update to trunk
(bzr r13682.1.35)
Diffstat (limited to 'src/live_effects/effect.cpp')
| -rw-r--r-- | src/live_effects/effect.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 22fa32bda..437aed5bd 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -109,7 +109,6 @@ const Util::EnumData<EffectType> LPETypeData[] = { {PATH_LENGTH, N_("Path length"), "path_length"}, {PERP_BISECTOR, N_("Perpendicular bisector"), "perp_bisector"}, {PERSPECTIVE_PATH, N_("Perspective path"), "perspective_path"}, - {COPY_ROTATE, N_("Rotate copies"), "copy_rotate"}, {RECURSIVE_SKELETON, N_("Recursive skeleton"), "recursive_skeleton"}, {TANGENT_TO_CURVE, N_("Tangent to curve"), "tangent_to_curve"}, {TEXT_LABEL, N_("Text label"), "text_label"}, @@ -145,6 +144,7 @@ const Util::EnumData<EffectType> LPETypeData[] = { {JOIN_TYPE, N_("Join type"), "join_type"}, {TAPER_STROKE, N_("Taper stroke"), "taper_stroke"}, {MIRROR_SYMMETRY, N_("Mirror symmetry"), "mirror_symmetry"}, + {COPY_ROTATE, N_("Rotate copies"), "copy_rotate"}, /* Ponyscape -> Inkscape 0.92*/ {ATTACH_PATH, N_("Attach path"), "attach_path"}, {FILL_BETWEEN_STROKES, N_("Fill between strokes"), "fill_between_strokes"}, @@ -467,6 +467,10 @@ void Effect::doBeforeEffect_impl(SPLPEItem const* lpeitem) pathvector_before_effect = sp_curve->get_pathvector(); } doBeforeEffect(lpeitem); + if (apply_to_clippath_and_mask && SP_IS_GROUP(sp_lpe_item)) { + sp_lpe_item->apply_to_clippath(sp_lpe_item); + sp_lpe_item->apply_to_mask(sp_lpe_item); + } } /** |