From: buliabyak <buliabyak@users.sourceforge.net>
Date: Mon, 14 Apr 2008 07:59:27 +0000 (+0000)
Subject: patch from bug 214171
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=515135c97f0d9a4b822a9ad2308dd1c85a22e6a4;p=inkscape.git

patch from bug 214171
---

diff --git a/src/style.cpp b/src/style.cpp
index 956727873..fd6b17892 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -1582,7 +1582,7 @@ sp_style_merge_paint_prop_from_dying_parent(SPStyle *style,
      * I haven't given this much attention.  See comments below about
      * currentColor, colorProfile, and relative URIs.
      */
-    if (!child.set || child.inherit || child.currentcolor) {
+    if (!child.set || child.inherit) {
         sp_style_merge_ipaint(style, &child, &parent);
         child.set = parent.set;
         child.inherit = parent.inherit;
@@ -2146,6 +2146,8 @@ sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent)
         }
     } else if ( parent->isColor() ) {
         paint->setColor( parent->value.color );
+    } else if ( parent->isNoneSet() ) {
+        paint->noneSet = TRUE;
     } else if ( parent->isNone() ) {
         //
     } else {