blob: 1a4d780f47871563d36dd3e16234ce61c4e048e8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
diff -pur inkscape-0.46.orig/src/style.cpp inkscape-0.46/src/style.cpp
--- inkscape-0.46.orig/src/style.cpp 2008-03-11 05:19:45.000000000 +0100
+++ inkscape-0.46/src/style.cpp 2008-03-28 12:35:52.000000000 +0100
@@ -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;
@@ -3001,6 +3003,7 @@ sp_style_read_icolor(SPIPaint *paint, gc
guint32 const rgb0 = sp_svg_read_color(str, 0xff);
if (rgb0 != 0xff) {
paint->setColor(rgb0);
+ paint->set = TRUE;
paint->inherit = FALSE;
}
}
Only in inkscape-0.46/src: style.cpp~
|
GitWeb
