summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-06-29 15:10:43 +0000
committertavmjong-free <tavmjong@free.fr>2014-06-29 15:10:43 +0000
commit74ac381c0cfbee634a7677aba3db6b2a0fd5f13f (patch)
tree1581e62537f4a17402052f251900933fbad6ea3e /src/ui
parentRemove the incorrect fix for the bug 1241902 (diff)
downloadinkscape-74ac381c0cfbee634a7677aba3db6b2a0fd5f13f.tar.gz
inkscape-74ac381c0cfbee634a7677aba3db6b2a0fd5f13f.zip
Enable rendering of new filter blend modes (but don't add them to GUI).
(bzr r13341.1.70)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/widget/filter-effect-chooser.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index 65706a9dc..78988a041 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -56,15 +56,12 @@ const Glib::ustring SimpleFilterModifier::get_blend_mode()
if (!(_flags & BLEND)) {
return "normal";
}
- if (_blend.get_active_row_number() == 5) {
+
+ const Util::EnumData<Inkscape::Filters::FilterBlendMode> *d = _blend.get_active_data();
+ if (d) {
+ return _blend.get_active_data()->key;
+ } else
return "normal";
- } else {
- const Util::EnumData<Inkscape::Filters::FilterBlendMode> *d = _blend.get_active_data();
- if (d) {
- return _blend.get_active_data()->key;
- } else
- return "normal";
- }
}
void SimpleFilterModifier::set_blend_mode(const int val)