diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-03-14 13:32:07 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-03-14 13:32:07 +0000 |
| commit | fd0ca31309d9fb4ffa8da11dee80f935ebc4c0fb (patch) | |
| tree | 54686ce820bd72a2081aec10d9638946937ae824 /src/style.cpp | |
| parent | commit VinÃcius code (diff) | |
| parent | Add a few font related tests. (diff) | |
| download | inkscape-fd0ca31309d9fb4ffa8da11dee80f935ebc4c0fb.tar.gz inkscape-fd0ca31309d9fb4ffa8da11dee80f935ebc4c0fb.zip | |
update to trunk
(bzr r11950.1.295)
Diffstat (limited to 'src/style.cpp')
| -rw-r--r-- | src/style.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/style.cpp b/src/style.cpp index de5b23854..132972164 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -1936,7 +1936,15 @@ sp_style_merge_from_parent(SPStyle *const style, SPStyle const *const parent) if (!style->color_rendering.set || style->color_rendering.inherit) { style->color_rendering.computed = parent->color_rendering.computed; } - + if (!style->image_rendering.set || style->image_rendering.inherit) { + style->image_rendering.computed = parent->image_rendering.computed; + } + if (!style->shape_rendering.set || style->shape_rendering.inherit) { + style->shape_rendering.computed = parent->shape_rendering.computed; + } + if (!style->text_rendering.set || style->text_rendering.inherit) { + style->text_rendering.computed = parent->text_rendering.computed; + } } template <typename T> |