diff options
| author | bulia byak <buliabyak@gmail.com> | 2008-04-14 07:59:27 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2008-04-14 07:59:27 +0000 |
| commit | 28e3a8b55425237d075b25f31ad7646b98107bd3 (patch) | |
| tree | 6d8cb1401d028920aff1d6b22ceb3bacda938d9d /src/style.cpp | |
| parent | suppress helperpath and handles showing for LPESpiro (diff) | |
| download | inkscape-28e3a8b55425237d075b25f31ad7646b98107bd3.tar.gz inkscape-28e3a8b55425237d075b25f31ad7646b98107bd3.zip | |
patch from bug 214171
(bzr r5440)
Diffstat (limited to 'src/style.cpp')
| -rw-r--r-- | src/style.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 { |