Merge branch 'master' of gitlab.com:inkscape/inkscape

1 files changed, 3 insertions, 8 deletions

diff --git a/src/object/sp-ellipse.cpp b/src/object/sp-ellipse.cpp
index 97bad1fdf..08be94f6f 100644
--- a/src/object/sp-ellipse.cpp
+++ b/src/object/sp-ellipse.cpp
@@ -502,15 +502,13 @@ void SPGenericEllipse::set_shape()
 
 Geom::Affine SPGenericEllipse::set_transform(Geom::Affine const &xform)
 {
-    // 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;
     }
+
     /* Calculate ellipse start in parent coords. */
     Geom::Point pos(Geom::Point(this->cx.computed, this->cy.computed) * xform);
 
@@ -559,9 +557,6 @@ Geom::Affine SPGenericEllipse::set_transform(Geom::Affine const &xform)
 
     // Adjust gradient fill
     this->adjust_gradient(xform * ret.inverse());
-
-    // Adjust livepatheffect
-    this->adjust_livepatheffect(xform);
     
     return ret;
 }