diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-12-25 16:05:40 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-12-25 16:05:40 +0000 |
| commit | 3598d85ed64693808296324289a2d6e5284d486e (patch) | |
| tree | 41d6829e1d3eecdf03c276b868e725c644312628 /src/sp-object.cpp | |
| parent | Remove sp_style_write_string() and sp_style_write_difference(). (diff) | |
| download | inkscape-3598d85ed64693808296324289a2d6e5284d486e.tar.gz inkscape-3598d85ed64693808296324289a2d6e5284d486e.zip | |
Remove sp_style_merge_from_parent() and sp_style_merge_from_dying_parent().
(bzr r13822.1.5)
Diffstat (limited to 'src/sp-object.cpp')
| -rw-r--r-- | src/sp-object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sp-object.cpp b/src/sp-object.cpp index d492e7817..af8855562 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -1145,7 +1145,7 @@ void SPObject::updateDisplay(SPCtx *ctx, unsigned int flags) */ if ((flags & SP_OBJECT_STYLE_MODIFIED_FLAG) && (flags & SP_OBJECT_PARENT_MODIFIED_FLAG)) { if (this->style && this->parent) { - sp_style_merge_from_parent(this->style, this->parent->style); + style->cascade( this->parent->style ); } } |