diff options
| author | bulia byak <buliabyak@gmail.com> | 2008-04-01 21:29:54 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2008-04-01 21:29:54 +0000 |
| commit | 739b5f32faba99a271d2aaec69844d5274fea417 (patch) | |
| tree | c155caedd04a91082a9e6b521df676df9c6f4a0d /src/style.cpp | |
| parent | move temporary canvas items to bottom by default. maybe fixes interfering of ... (diff) | |
| download | inkscape-739b5f32faba99a271d2aaec69844d5274fea417.tar.gz inkscape-739b5f32faba99a271d2aaec69844d5274fea417.zip | |
patch by Martin von Gagern for bug 174720
(bzr r5301)
Diffstat (limited to 'src/style.cpp')
| -rw-r--r-- | src/style.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/style.cpp b/src/style.cpp index a50fedf6b..45a560d27 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -2125,7 +2125,9 @@ static void sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent) { if ((paint->set && paint->currentcolor) || parent->currentcolor) { + bool isset = paint->set; paint->clear(); + paint->set = isset; paint->currentcolor = TRUE; paint->setColor(style->color.value.color); return; @@ -3016,6 +3018,7 @@ sp_style_read_icolor(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocume guint32 const rgb0 = sp_svg_read_color(str, 0xff); if (rgb0 != 0xff) { paint->setColor(rgb0); + paint->set = TRUE; paint->inherit = FALSE; } } |