summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Holder <thomas@thomas-holder.de>2019-10-27 19:06:46 +0000
committerThomas Holder <thomas@thomas-holder.de>2019-10-27 19:06:46 +0000
commitec01ba89386aa90dc237d10a877512e336a05e21 (patch)
tree9ce4dc99896f5d5799d68eb0cd45d2f622e97dd7 /src
parentFix XRay memory problem by no end iddle (diff)
downloadinkscape-ec01ba89386aa90dc237d10a877512e336a05e21.tar.gz
inkscape-ec01ba89386aa90dc237d10a877512e336a05e21.zip
fix merging "opacity" and "stop-opacity"
Regression of abc7ea9287dc
Diffstat (limited to 'src')
-rw-r--r--src/style-internal.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index 80f7c1cea..3fe9fcb81 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -195,7 +195,7 @@ SPIScale24::merge( const SPIBase* const parent ) {
std::cerr << "SPIScale24::merge: unhandled property: " << name << std::endl;
if( !set || (!inherit && value == SP_SCALE24_MAX) ) {
value = p->value;
- set = (value != 1.0);
+ set = (value != SP_SCALE24_MAX);
} else {
if( inherit ) value = p->value; // Insures child is up-to-date
value = SP_SCALE24_MUL( value, p->value );