diff options
| author | Martin Owens <doctormo@gmail.com> | 2018-10-01 13:53:24 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2018-10-01 13:53:24 +0000 |
| commit | 2dca0aac3ca509cf2704e5730195376a009adb70 (patch) | |
| tree | 8326fcb65ab2ca570be2b6c6f6cbacb419d18b17 /src/object/sp-star.cpp | |
| parent | Fix the object-to-path bug by adding back the SPIBase check. (diff) | |
| parent | Fix for bug #263620 comment 5, (diff) | |
| download | inkscape-2dca0aac3ca509cf2704e5730195376a009adb70.tar.gz inkscape-2dca0aac3ca509cf2704e5730195376a009adb70.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/object/sp-star.cpp')
| -rw-r--r-- | src/object/sp-star.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/object/sp-star.cpp b/src/object/sp-star.cpp index a960d2018..b0c9a8197 100644 --- a/src/object/sp-star.cpp +++ b/src/object/sp-star.cpp @@ -494,21 +494,14 @@ void SPStar::snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape:: Geom::Affine SPStar::set_transform(Geom::Affine const &xform) { bool opt_trans = (randomized == 0); - // TODO: try to remove CLONE_ORIGINAL from here - if (hasPathEffect() && pathEffectsEnabled() && - this->hasPathEffectOfType(Inkscape::LivePathEffect::CLONE_ORIGINAL)) + if (hasPathEffect() && pathEffectsEnabled()) { - // if path has this LPE applied, don't write the transform to the pathdata, but write it 'unoptimized' - // also if the effect is type BEND PATH to fix bug #179842 + // Inverse it to compensate this->adjust_livepatheffect(xform.inverse()); return xform; } // Only set transform with proportional scaling if (!xform.withoutTranslation().isUniformScale()) { - // Adjust livepatheffect - if (hasPathEffect() && pathEffectsEnabled()) { - this->adjust_livepatheffect(xform.inverse()); - } return xform; } @@ -549,9 +542,6 @@ Geom::Affine SPStar::set_transform(Geom::Affine const &xform) // Adjust gradient fill this->adjust_gradient(xform * ret.inverse()); - // Adjust livepatheffect - this->adjust_livepatheffect(xform); - return ret; } |
