From: buliabyak <buliabyak@users.sourceforge.net>
Date: Tue, 1 Apr 2008 21:29:54 +0000 (+0000)
Subject: patch by Martin von Gagern for bug 174720
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5fb452bf222dd2563077a5bd4eee9183fd8b33b7;p=inkscape.git

patch by Martin von Gagern for bug 174720
---

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;
         }
     }