diff options
| author | Michael Soegtrop <MSoegtrop@yahoo.de> | 2017-06-05 13:56:11 +0000 |
|---|---|---|
| committer | Michael Soegtrop <MSoegtrop@yahoo.de> | 2017-06-05 13:56:11 +0000 |
| commit | 7ee81350c73388881e60a59928d26764b7172c9b (patch) | |
| tree | b561a4dbbacd7eecbdbae3fa220a353375ccecf8 /src/sp-shape.cpp | |
| parent | updated to trunk (diff) | |
| parent | [Bug #1695016] Xaml export misses some radialGradients. (diff) | |
| download | inkscape-7ee81350c73388881e60a59928d26764b7172c9b.tar.gz inkscape-7ee81350c73388881e60a59928d26764b7172c9b.zip | |
merged with latest version of lpe-bool and trunk
(bzr r14862.2.3)
Diffstat (limited to 'src/sp-shape.cpp')
| -rw-r--r-- | src/sp-shape.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp index 78135d459..9edf03cbf 100644 --- a/src/sp-shape.cpp +++ b/src/sp-shape.cpp @@ -15,21 +15,19 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include <2geom/rect.h> #include <2geom/transforms.h> #include <2geom/pathvector.h> #include <2geom/path-intersection.h> -#include <2geom/exception.h> #include "helper/geom.h" #include "helper/geom-nodetype.h" #include <sigc++/functors/ptr_fun.h> #include <sigc++/adaptors/bind.h> -#include "macros.h" #include "display/drawing-shape.h" #include "display/curve.h" #include "print.h" @@ -41,11 +39,6 @@ #include "attributes.h" #include "live_effects/lpeobject.h" -#include "uri.h" -#include "extract-uri.h" -#include "uri-references.h" -#include "bad-uri-exception.h" -#include "xml/repr.h" #include "helper/mathfns.h" // for triangle_area() @@ -1034,7 +1027,7 @@ SPCurve * SPShape::getCurve() const */ SPCurve * SPShape::getCurveBeforeLPE() const { - if (hasPathEffect()) { + if (hasPathEffectRecursive()) { if (_curve_before_lpe) { return this->_curve_before_lpe->copy(); } |