diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-06-29 15:12:27 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-06-29 15:12:27 +0000 |
| commit | 5382e1fb57cb06f5d4a21e3e553ccdd9395014f5 (patch) | |
| tree | 392f5c034baab749d0dd9b5ca24295bc3c4c3e1e /src/filter-enums.cpp | |
| parent | Layers. Fix for Bug #1326131 (Can't delete layer from context menu). (diff) | |
| download | inkscape-5382e1fb57cb06f5d4a21e3e553ccdd9395014f5.tar.gz inkscape-5382e1fb57cb06f5d4a21e3e553ccdd9395014f5.zip | |
Enable rendering of new filter blend modes (but don't add them to GUI).
(bzr r13443)
Diffstat (limited to 'src/filter-enums.cpp')
| -rw-r--r-- | src/filter-enums.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/filter-enums.cpp b/src/filter-enums.cpp index 7ee57f7fa..09a1a7614 100644 --- a/src/filter-enums.cpp +++ b/src/filter-enums.cpp @@ -53,7 +53,6 @@ const EnumData<Inkscape::Filters::FilterBlendMode> BlendModeData[Inkscape::Filte {Inkscape::Filters::BLEND_SCREEN, _("Screen"), "screen"}, {Inkscape::Filters::BLEND_DARKEN, _("Darken"), "darken"}, {Inkscape::Filters::BLEND_LIGHTEN, _("Lighten"), "lighten"}, -#ifdef WITH_CSSBLEND // New in Compositing and Blending Level 1 {Inkscape::Filters::BLEND_OVERLAY, _("Overlay"), "overlay"}, {Inkscape::Filters::BLEND_COLORDODGE, _("Color Dodge"), "color-dodge"}, @@ -66,10 +65,13 @@ const EnumData<Inkscape::Filters::FilterBlendMode> BlendModeData[Inkscape::Filte {Inkscape::Filters::BLEND_SATURATION, _("Saturation"), "saturation"}, {Inkscape::Filters::BLEND_COLOR, _("Color"), "color"}, {Inkscape::Filters::BLEND_LUMINOSITY, _("Luminosity"), "luminosity"} -#endif }; +#ifdef WITH_CSSBLEND const EnumDataConverter<Inkscape::Filters::FilterBlendMode> BlendModeConverter(BlendModeData, Inkscape::Filters::BLEND_ENDMODE); - +#else +// Disable new blend modes in GUI until widely implemented. +const EnumDataConverter<Inkscape::Filters::FilterBlendMode> BlendModeConverter(BlendModeData, Inkscape::Filters::BLEND_OVERLAY); +#endif const EnumData<Inkscape::Filters::FilterColorMatrixType> ColorMatrixTypeData[Inkscape::Filters::COLORMATRIX_ENDTYPE] = { {Inkscape::Filters::COLORMATRIX_MATRIX, _("Matrix"), "matrix"}, |