summaryrefslogtreecommitdiffstats
path: root/src/style-internal.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2018-01-17 23:16:06 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2018-01-17 23:16:06 +0000
commitabc7ea9287dcbcd4b8b8a1ff98b3d1e19c2ee226 (patch)
treeef08851cdb131931861913b0d85c3c6cbcea9a30 /src/style-internal.cpp
parentProperly support palettes without color names (diff)
downloadinkscape-abc7ea9287dcbcd4b8b8a1ff98b3d1e19c2ee226.tar.gz
inkscape-abc7ea9287dcbcd4b8b8a1ff98b3d1e19c2ee226.zip
Fixes https://bugs.launchpad.net/inkscape/+bug/1742305 (ungrouping can lose group's opacity)
Diffstat (limited to 'src/style-internal.cpp')
-rw-r--r--src/style-internal.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index 319f4b905..5d9be05aa 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -206,6 +206,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);
} else {
if( inherit ) value = p->value; // Insures child is up-to-date
value = SP_SCALE24_MUL( value, p->value );