diff options
| author | Niko Kiirala <niko@kiirala.com> | 2008-07-24 15:06:47 +0000 |
|---|---|---|
| committer | kiirala <kiirala@users.sourceforge.net> | 2008-07-24 15:06:47 +0000 |
| commit | fb747ffafe29d39b68f01fbb55c9e9059c14f7cd (patch) | |
| tree | 2d8200ae7f93ec2e55724c0e8b74ad5374432cd3 | |
| parent | make presets list autoscroll to match the values set (diff) | |
| download | inkscape-fb747ffafe29d39b68f01fbb55c9e9059c14f7cd.tar.gz inkscape-fb747ffafe29d39b68f01fbb55c9e9059c14f7cd.zip | |
Fixed regression: changing blend mode in layers dialog didn't work
(bzr r6409)
| -rw-r--r-- | src/filter-chemistry.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/object-composite-settings.cpp | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/filter-chemistry.cpp b/src/filter-chemistry.cpp index 90151d6d2..cefb3227d 100644 --- a/src/filter-chemistry.cpp +++ b/src/filter-chemistry.cpp @@ -8,7 +8,7 @@ * bulia byak * Niko Kiirala * - * Copyright (C) 2006,2007 authors + * Copyright (C) 2006-2008 authors * * Released under GNU GPL, read the file 'COPYING' for more information */ diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index 7f0f4767b..088af176a 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -4,8 +4,9 @@ * Authors: * Bryce W. Harrington <bryce@bryceharrington.org> * Gustav Broberg <broberg@kth.se> + * Niko Kiirala <niko@kiirala.com> * - * Copyright (C) 2004--2007 Authors + * Copyright (C) 2004--2008 Authors * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -122,7 +123,7 @@ ObjectCompositeSettings::_blendBlurValueChanged() radius = 0; } - //const Glib::ustring blendmode = _fe_cb.get_blend_mode(); + const Glib::ustring blendmode = _fe_cb.get_blend_mode(); //apply created filter to every selected item for (StyleSubject::iterator i = _subject->begin() ; i != _subject->end() ; ++i ) { @@ -134,11 +135,16 @@ ObjectCompositeSettings::_blendBlurValueChanged() SPStyle *style = SP_OBJECT_STYLE(item); g_assert(style != NULL); + if (blendmode != "normal") { + SPFilter *filter = new_filter_simple_from_item(document, item, blendmode.c_str(), radius); + sp_style_set_property_url(item, "filter", filter, false); + } + if (radius == 0 && item->style->filter.set && filter_is_single_gaussian_blur(SP_FILTER(item->style->getFilter()))) { remove_filter(item, false); } - else { + else if (radius != 0) { SPFilter *filter = modify_filter_gaussian_blur_from_item(document, item, radius); sp_style_set_property_url(item, "filter", filter, false); } |