diff options
| author | Markus Engel <markus.engel@tum.de> | 2014-07-23 20:29:55 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2014-07-23 20:29:55 +0000 |
| commit | d9e1d33c2eb1793056aab9c4d567e7981042a294 (patch) | |
| tree | ea995a87a71cc79aeabb7dcff725e4837a2e1650 /src | |
| parent | inkex: Clarify a dupe error msg, for easier debugging (diff) | |
| download | inkscape-d9e1d33c2eb1793056aab9c4d567e7981042a294.tar.gz inkscape-d9e1d33c2eb1793056aab9c4d567e7981042a294.zip | |
Partly reverted r13460.
(bzr r13464)
Diffstat (limited to 'src')
| -rw-r--r-- | src/sp-item.cpp | 2 | ||||
| -rw-r--r-- | src/sp-lpe-item.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/sp-item.cpp b/src/sp-item.cpp index 698559a9f..0cdff6546 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -1264,7 +1264,7 @@ void SPItem::adjust_paint_recursive (Geom::Affine advertized_transform, Geom::Af // Within text, we do not fork gradients, and so must not recurse to avoid double compensation; // also we do not recurse into clones, because a clone's child is the ghost of its original - // we must not touch it - if (!(SP_IS_TEXT(this) || SP_IS_USE(this))) { + if (!(this && (SP_IS_TEXT(this) || SP_IS_USE(this)))) { for (SPObject *o = children; o != NULL; o = o->next) { if (SP_IS_ITEM(o)) { // At the level of the transformed item, t_ancestors is identity; diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp index 800b31f87..321d2fc42 100644 --- a/src/sp-lpe-item.cpp +++ b/src/sp-lpe-item.cpp @@ -212,6 +212,10 @@ Inkscape::XML::Node* SPLPEItem::write(Inkscape::XML::Document *xml_doc, Inkscape * returns true when LPE was successful. */ bool SPLPEItem::performPathEffect(SPCurve *curve) { + if (!this) { + return false; + } + if (!curve) { return false; } |