diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-10-06 00:18:46 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-10-06 00:18:46 +0000 |
| commit | 7d38f876e8a4c5ab60261f61452fa2bf8baf13f3 (patch) | |
| tree | 8d93f93ef7634ca78637b55edb9de4401669b2bb /src/sp-item.cpp | |
| parent | Add missing file to CMakeLists (diff) | |
| parent | Remove unused functions. (diff) | |
| download | inkscape-7d38f876e8a4c5ab60261f61452fa2bf8baf13f3.tar.gz inkscape-7d38f876e8a4c5ab60261f61452fa2bf8baf13f3.zip | |
Update to trunk r13580
(bzr r13341.1.255)
Diffstat (limited to 'src/sp-item.cpp')
| -rw-r--r-- | src/sp-item.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sp-item.cpp b/src/sp-item.cpp index 10dc1a32c..c5b4b1667 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -44,6 +44,7 @@ #include "sp-rect.h" #include "sp-use.h" #include "sp-text.h" +#include "sp-textpath.h" #include "sp-item-rm-unsatisfied-cns.h" #include "sp-pattern.h" #include "sp-paint-server.h" @@ -1447,10 +1448,11 @@ void SPItem::doWriteTransform(Inkscape::XML::Node *repr, Geom::Affine const &tra // onSetTransform cannot be pure due to the fact that not all visible Items are transformable. if ( // run the object's set_transform (i.e. embed transform) only if: - !preserve && // user did not chose to preserve all transforms + SP_IS_TEXT_TEXTPATH(this) || + (!preserve && // user did not chose to preserve all transforms (!clip_ref || !clip_ref->getObject()) && // the object does not have a clippath (!mask_ref || !mask_ref->getObject()) && // the object does not have a mask - !(!transform.isTranslation() && style && style->getFilter()) // the object does not have a filter, or the transform is translation (which is supposed to not affect filters) + !(!transform.isTranslation() && style && style->getFilter())) // the object does not have a filter, or the transform is translation (which is supposed to not affect filters) ) { transform_attr = this->set_transform(transform); |
