[gimp] Rename GIMP_LAYER_MODE_FOO_BROKEN to GIMP_LAYER_MODE_FOO_LEGACY
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Rename GIMP_LAYER_MODE_FOO_BROKEN to GIMP_LAYER_MODE_FOO_LEGACY
- Date: Mon, 9 Jan 2017 00:28:37 +0000 (UTC)
commit 152adbb1bd1bbe5e244de8249ab0b0d68001ee67
Author: Michael Natterer <mitch gimp org>
Date: Mon Jan 9 01:27:20 2017 +0100
Rename GIMP_LAYER_MODE_FOO_BROKEN to GIMP_LAYER_MODE_FOO_LEGACY
"Broken" sounds like it needs fixing, but it's legacy compat stuff
that will have to stay for all eternity.
app/actions/context-commands.c | 36 ++++++------
app/actions/layers-commands.c | 36 ++++++------
app/core/core-enums.c | 76 +++++++++++++-------------
app/core/core-enums.h | 38 +++++++-------
app/core/gimpcontext.c | 4 +-
app/core/gimpimage.c | 6 +-
app/gegl/gimp-gegl-nodes.c | 38 +++++++-------
app/operations/gimplayermodefunctions.c | 38 +++++++-------
app/pdb/brush-select-cmds.c | 8 ++--
app/pdb/brushes-cmds.c | 4 +-
app/pdb/context-cmds.c | 4 +-
app/pdb/edit-cmds.c | 12 ++--
app/pdb/layer-cmds.c | 8 ++--
app/tests/test-xcf.c | 2 +-
app/widgets/gimpwidgets-constructors.c | 46 ++++++++--------
app/xcf/xcf-load.c | 4 +-
app/xcf/xcf-save.c | 4 +-
libgimp/gimpenums.h | 38 +++++++-------
plug-ins/common/file-psp.c | 26 +++++-----
plug-ins/file-psd/psd-save.c | 26 +++++-----
plug-ins/file-psd/psd-util.c | 68 ++++++++++++------------
plug-ins/pygimp/gimpenumsmodule.c | 38 +++++++-------
plug-ins/pygimp/plug-ins/file-openraster.py | 28 +++++-----
plug-ins/script-fu/scheme-wrapper.c | 38 +++++++-------
tools/pdbgen/enums.pl | 76 +++++++++++++-------------
tools/pdbgen/pdb/brush_select.pdb | 8 ++--
tools/pdbgen/pdb/brushes.pdb | 4 +-
tools/pdbgen/pdb/context.pdb | 4 +-
tools/pdbgen/pdb/edit.pdb | 12 ++--
tools/pdbgen/pdb/layer.pdb | 8 ++--
30 files changed, 369 insertions(+), 369 deletions(-)
---
diff --git a/app/actions/context-commands.c b/app/actions/context-commands.c
index 9b09ab4..6615422 100644
--- a/app/actions/context-commands.c
+++ b/app/actions/context-commands.c
@@ -54,25 +54,25 @@ static const GimpLayerMode paint_modes[] =
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_BEHIND,
GIMP_LAYER_MODE_COLOR_ERASE,
- GIMP_LAYER_MODE_MULTIPLY_BROKEN,
- GIMP_LAYER_MODE_DIVIDE_BROKEN,
- GIMP_LAYER_MODE_SCREEN_BROKEN,
+ GIMP_LAYER_MODE_MULTIPLY_LEGACY,
+ GIMP_LAYER_MODE_DIVIDE_LEGACY,
+ GIMP_LAYER_MODE_SCREEN_LEGACY,
GIMP_LAYER_MODE_OVERLAY,
- GIMP_LAYER_MODE_DODGE_BROKEN,
- GIMP_LAYER_MODE_BURN_BROKEN,
- GIMP_LAYER_MODE_HARDLIGHT_BROKEN,
- GIMP_LAYER_MODE_SOFTLIGHT_BROKEN,
- GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN,
- GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN,
- GIMP_LAYER_MODE_DIFFERENCE_BROKEN,
- GIMP_LAYER_MODE_ADDITION_BROKEN,
- GIMP_LAYER_MODE_SUBTRACT_BROKEN,
- GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN,
- GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN,
- GIMP_LAYER_MODE_HSV_HUE_BROKEN,
- GIMP_LAYER_MODE_HSV_SATURATION_BROKEN,
- GIMP_LAYER_MODE_HSV_COLOR_BROKEN,
- GIMP_LAYER_MODE_HSV_VALUE_BROKEN,
+ GIMP_LAYER_MODE_DODGE_LEGACY,
+ GIMP_LAYER_MODE_BURN_LEGACY,
+ GIMP_LAYER_MODE_HARDLIGHT_LEGACY,
+ GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
+ GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,
+ GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,
+ GIMP_LAYER_MODE_DIFFERENCE_LEGACY,
+ GIMP_LAYER_MODE_ADDITION_LEGACY,
+ GIMP_LAYER_MODE_SUBTRACT_LEGACY,
+ GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,
+ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
+ GIMP_LAYER_MODE_HSV_HUE_LEGACY,
+ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
+ GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
+ GIMP_LAYER_MODE_HSV_VALUE_LEGACY,
GIMP_LAYER_MODE_LCH_HUE,
GIMP_LAYER_MODE_LCH_CHROMA,
GIMP_LAYER_MODE_LCH_COLOR,
diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index abc1b84..d8d5323 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -85,25 +85,25 @@ static const GimpLayerMode layer_modes[] =
{
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_DISSOLVE,
- GIMP_LAYER_MODE_MULTIPLY_BROKEN,
- GIMP_LAYER_MODE_DIVIDE_BROKEN,
- GIMP_LAYER_MODE_SCREEN_BROKEN,
+ GIMP_LAYER_MODE_MULTIPLY_LEGACY,
+ GIMP_LAYER_MODE_DIVIDE_LEGACY,
+ GIMP_LAYER_MODE_SCREEN_LEGACY,
GIMP_LAYER_MODE_OVERLAY,
- GIMP_LAYER_MODE_DODGE_BROKEN,
- GIMP_LAYER_MODE_BURN_BROKEN,
- GIMP_LAYER_MODE_HARDLIGHT_BROKEN,
- GIMP_LAYER_MODE_SOFTLIGHT_BROKEN,
- GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN,
- GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN,
- GIMP_LAYER_MODE_DIFFERENCE_BROKEN,
- GIMP_LAYER_MODE_ADDITION_BROKEN,
- GIMP_LAYER_MODE_SUBTRACT_BROKEN,
- GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN,
- GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN,
- GIMP_LAYER_MODE_HSV_HUE_BROKEN,
- GIMP_LAYER_MODE_HSV_SATURATION_BROKEN,
- GIMP_LAYER_MODE_HSV_COLOR_BROKEN,
- GIMP_LAYER_MODE_HSV_VALUE_BROKEN,
+ GIMP_LAYER_MODE_DODGE_LEGACY,
+ GIMP_LAYER_MODE_BURN_LEGACY,
+ GIMP_LAYER_MODE_HARDLIGHT_LEGACY,
+ GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
+ GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,
+ GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,
+ GIMP_LAYER_MODE_DIFFERENCE_LEGACY,
+ GIMP_LAYER_MODE_ADDITION_LEGACY,
+ GIMP_LAYER_MODE_SUBTRACT_LEGACY,
+ GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,
+ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
+ GIMP_LAYER_MODE_HSV_HUE_LEGACY,
+ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
+ GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
+ GIMP_LAYER_MODE_HSV_VALUE_LEGACY,
GIMP_LAYER_MODE_LCH_HUE,
GIMP_LAYER_MODE_LCH_CHROMA,
GIMP_LAYER_MODE_LCH_COLOR,
diff --git a/app/core/core-enums.c b/app/core/core-enums.c
index 4ca06f0..e4add25 100644
--- a/app/core/core-enums.c
+++ b/app/core/core-enums.c
@@ -292,25 +292,25 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_NORMAL, "GIMP_LAYER_MODE_NORMAL", "normal" },
{ GIMP_LAYER_MODE_DISSOLVE, "GIMP_LAYER_MODE_DISSOLVE", "dissolve" },
{ GIMP_LAYER_MODE_BEHIND, "GIMP_LAYER_MODE_BEHIND", "behind" },
- { GIMP_LAYER_MODE_MULTIPLY_BROKEN, "GIMP_LAYER_MODE_MULTIPLY_BROKEN", "multiply-broken" },
- { GIMP_LAYER_MODE_SCREEN_BROKEN, "GIMP_LAYER_MODE_SCREEN_BROKEN", "screen-broken" },
- { GIMP_LAYER_MODE_OVERLAY_BROKEN, "GIMP_LAYER_MODE_OVERLAY_BROKEN", "overlay-broken" },
- { GIMP_LAYER_MODE_DIFFERENCE_BROKEN, "GIMP_LAYER_MODE_DIFFERENCE_BROKEN", "difference-broken" },
- { GIMP_LAYER_MODE_ADDITION_BROKEN, "GIMP_LAYER_MODE_ADDITION_BROKEN", "addition-broken" },
- { GIMP_LAYER_MODE_SUBTRACT_BROKEN, "GIMP_LAYER_MODE_SUBTRACT_BROKEN", "subtract-broken" },
- { GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN, "GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN", "darken-only-broken" },
- { GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN, "GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN", "lighten-only-broken" },
- { GIMP_LAYER_MODE_HSV_HUE_BROKEN, "GIMP_LAYER_MODE_HSV_HUE_BROKEN", "hsv-hue-broken" },
- { GIMP_LAYER_MODE_HSV_SATURATION_BROKEN, "GIMP_LAYER_MODE_HSV_SATURATION_BROKEN",
"hsv-saturation-broken" },
- { GIMP_LAYER_MODE_HSV_COLOR_BROKEN, "GIMP_LAYER_MODE_HSV_COLOR_BROKEN", "hsv-color-broken" },
- { GIMP_LAYER_MODE_HSV_VALUE_BROKEN, "GIMP_LAYER_MODE_HSV_VALUE_BROKEN", "hsv-value-broken" },
- { GIMP_LAYER_MODE_DIVIDE_BROKEN, "GIMP_LAYER_MODE_DIVIDE_BROKEN", "divide-broken" },
- { GIMP_LAYER_MODE_DODGE_BROKEN, "GIMP_LAYER_MODE_DODGE_BROKEN", "dodge-broken" },
- { GIMP_LAYER_MODE_BURN_BROKEN, "GIMP_LAYER_MODE_BURN_BROKEN", "burn-broken" },
- { GIMP_LAYER_MODE_HARDLIGHT_BROKEN, "GIMP_LAYER_MODE_HARDLIGHT_BROKEN", "hardlight-broken" },
- { GIMP_LAYER_MODE_SOFTLIGHT_BROKEN, "GIMP_LAYER_MODE_SOFTLIGHT_BROKEN", "softlight-broken" },
- { GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN, "GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN", "grain-extract-broken" },
- { GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN, "GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN", "grain-merge-broken" },
+ { GIMP_LAYER_MODE_MULTIPLY_LEGACY, "GIMP_LAYER_MODE_MULTIPLY_LEGACY", "multiply-legacy" },
+ { GIMP_LAYER_MODE_SCREEN_LEGACY, "GIMP_LAYER_MODE_SCREEN_LEGACY", "screen-legacy" },
+ { GIMP_LAYER_MODE_OVERLAY_LEGACY, "GIMP_LAYER_MODE_OVERLAY_LEGACY", "overlay-legacy" },
+ { GIMP_LAYER_MODE_DIFFERENCE_LEGACY, "GIMP_LAYER_MODE_DIFFERENCE_LEGACY", "difference-legacy" },
+ { GIMP_LAYER_MODE_ADDITION_LEGACY, "GIMP_LAYER_MODE_ADDITION_LEGACY", "addition-legacy" },
+ { GIMP_LAYER_MODE_SUBTRACT_LEGACY, "GIMP_LAYER_MODE_SUBTRACT_LEGACY", "subtract-legacy" },
+ { GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, "GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY", "darken-only-legacy" },
+ { GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, "GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY", "lighten-only-legacy" },
+ { GIMP_LAYER_MODE_HSV_HUE_LEGACY, "GIMP_LAYER_MODE_HSV_HUE_LEGACY", "hsv-hue-legacy" },
+ { GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, "GIMP_LAYER_MODE_HSV_SATURATION_LEGACY",
"hsv-saturation-legacy" },
+ { GIMP_LAYER_MODE_HSV_COLOR_LEGACY, "GIMP_LAYER_MODE_HSV_COLOR_LEGACY", "hsv-color-legacy" },
+ { GIMP_LAYER_MODE_HSV_VALUE_LEGACY, "GIMP_LAYER_MODE_HSV_VALUE_LEGACY", "hsv-value-legacy" },
+ { GIMP_LAYER_MODE_DIVIDE_LEGACY, "GIMP_LAYER_MODE_DIVIDE_LEGACY", "divide-legacy" },
+ { GIMP_LAYER_MODE_DODGE_LEGACY, "GIMP_LAYER_MODE_DODGE_LEGACY", "dodge-legacy" },
+ { GIMP_LAYER_MODE_BURN_LEGACY, "GIMP_LAYER_MODE_BURN_LEGACY", "burn-legacy" },
+ { GIMP_LAYER_MODE_HARDLIGHT_LEGACY, "GIMP_LAYER_MODE_HARDLIGHT_LEGACY", "hardlight-legacy" },
+ { GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, "GIMP_LAYER_MODE_SOFTLIGHT_LEGACY", "softlight-legacy" },
+ { GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, "GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY", "grain-extract-legacy" },
+ { GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, "GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY", "grain-merge-legacy" },
{ GIMP_LAYER_MODE_COLOR_ERASE, "GIMP_LAYER_MODE_COLOR_ERASE", "color-erase" },
{ GIMP_LAYER_MODE_OVERLAY, "GIMP_LAYER_MODE_OVERLAY", "overlay" },
{ GIMP_LAYER_MODE_LCH_HUE, "GIMP_LAYER_MODE_LCH_HUE", "lch-hue" },
@@ -328,25 +328,25 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_NORMAL, NC_("layer-mode", "Normal"), NULL },
{ GIMP_LAYER_MODE_DISSOLVE, NC_("layer-mode", "Dissolve"), NULL },
{ GIMP_LAYER_MODE_BEHIND, NC_("layer-mode", "Behind"), NULL },
- { GIMP_LAYER_MODE_MULTIPLY_BROKEN, NC_("layer-mode", "Multiply"), NULL },
- { GIMP_LAYER_MODE_SCREEN_BROKEN, NC_("layer-mode", "Screen"), NULL },
- { GIMP_LAYER_MODE_OVERLAY_BROKEN, NC_("layer-mode", "Old broken Overlay"), NULL },
- { GIMP_LAYER_MODE_DIFFERENCE_BROKEN, NC_("layer-mode", "Difference"), NULL },
- { GIMP_LAYER_MODE_ADDITION_BROKEN, NC_("layer-mode", "Addition"), NULL },
- { GIMP_LAYER_MODE_SUBTRACT_BROKEN, NC_("layer-mode", "Subtract"), NULL },
- { GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN, NC_("layer-mode", "Darken only"), NULL },
- { GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN, NC_("layer-mode", "Lighten only"), NULL },
- { GIMP_LAYER_MODE_HSV_HUE_BROKEN, NC_("layer-mode", "Hue (HSV)"), NULL },
- { GIMP_LAYER_MODE_HSV_SATURATION_BROKEN, NC_("layer-mode", "Saturation (HSV)"), NULL },
- { GIMP_LAYER_MODE_HSV_COLOR_BROKEN, NC_("layer-mode", "Color (HSV)"), NULL },
- { GIMP_LAYER_MODE_HSV_VALUE_BROKEN, NC_("layer-mode", "Value (HSV)"), NULL },
- { GIMP_LAYER_MODE_DIVIDE_BROKEN, NC_("layer-mode", "Divide"), NULL },
- { GIMP_LAYER_MODE_DODGE_BROKEN, NC_("layer-mode", "Dodge"), NULL },
- { GIMP_LAYER_MODE_BURN_BROKEN, NC_("layer-mode", "Burn"), NULL },
- { GIMP_LAYER_MODE_HARDLIGHT_BROKEN, NC_("layer-mode", "Hard light"), NULL },
- { GIMP_LAYER_MODE_SOFTLIGHT_BROKEN, NC_("layer-mode", "Soft light"), NULL },
- { GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN, NC_("layer-mode", "Grain extract"), NULL },
- { GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN, NC_("layer-mode", "Grain merge"), NULL },
+ { GIMP_LAYER_MODE_MULTIPLY_LEGACY, NC_("layer-mode", "Multiply"), NULL },
+ { GIMP_LAYER_MODE_SCREEN_LEGACY, NC_("layer-mode", "Screen"), NULL },
+ { GIMP_LAYER_MODE_OVERLAY_LEGACY, NC_("layer-mode", "Old broken Overlay"), NULL },
+ { GIMP_LAYER_MODE_DIFFERENCE_LEGACY, NC_("layer-mode", "Difference"), NULL },
+ { GIMP_LAYER_MODE_ADDITION_LEGACY, NC_("layer-mode", "Addition"), NULL },
+ { GIMP_LAYER_MODE_SUBTRACT_LEGACY, NC_("layer-mode", "Subtract"), NULL },
+ { GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, NC_("layer-mode", "Darken only"), NULL },
+ { GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, NC_("layer-mode", "Lighten only"), NULL },
+ { GIMP_LAYER_MODE_HSV_HUE_LEGACY, NC_("layer-mode", "Hue (HSV)"), NULL },
+ { GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, NC_("layer-mode", "Saturation (HSV)"), NULL },
+ { GIMP_LAYER_MODE_HSV_COLOR_LEGACY, NC_("layer-mode", "Color (HSV)"), NULL },
+ { GIMP_LAYER_MODE_HSV_VALUE_LEGACY, NC_("layer-mode", "Value (HSV)"), NULL },
+ { GIMP_LAYER_MODE_DIVIDE_LEGACY, NC_("layer-mode", "Divide"), NULL },
+ { GIMP_LAYER_MODE_DODGE_LEGACY, NC_("layer-mode", "Dodge"), NULL },
+ { GIMP_LAYER_MODE_BURN_LEGACY, NC_("layer-mode", "Burn"), NULL },
+ { GIMP_LAYER_MODE_HARDLIGHT_LEGACY, NC_("layer-mode", "Hard light"), NULL },
+ { GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, NC_("layer-mode", "Soft light"), NULL },
+ { GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, NC_("layer-mode", "Grain extract"), NULL },
+ { GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, NC_("layer-mode", "Grain merge"), NULL },
{ GIMP_LAYER_MODE_COLOR_ERASE, NC_("layer-mode", "Color erase"), NULL },
{ GIMP_LAYER_MODE_OVERLAY, NC_("layer-mode", "Overlay"), NULL },
{ GIMP_LAYER_MODE_LCH_HUE, NC_("layer-mode", "Hue (LCH)"), NULL },
diff --git a/app/core/core-enums.h b/app/core/core-enums.h
index 933aabd..6ad105c 100644
--- a/app/core/core-enums.h
+++ b/app/core/core-enums.h
@@ -157,25 +157,25 @@ typedef enum
GIMP_LAYER_MODE_NORMAL, /*< desc="Normal" >*/
GIMP_LAYER_MODE_DISSOLVE, /*< desc="Dissolve" >*/
GIMP_LAYER_MODE_BEHIND, /*< desc="Behind" >*/
- GIMP_LAYER_MODE_MULTIPLY_BROKEN, /*< desc="Multiply" >*/
- GIMP_LAYER_MODE_SCREEN_BROKEN, /*< desc="Screen" >*/
- GIMP_LAYER_MODE_OVERLAY_BROKEN, /*< desc="Old broken Overlay" >*/
- GIMP_LAYER_MODE_DIFFERENCE_BROKEN, /*< desc="Difference" >*/
- GIMP_LAYER_MODE_ADDITION_BROKEN, /*< desc="Addition" >*/
- GIMP_LAYER_MODE_SUBTRACT_BROKEN, /*< desc="Subtract" >*/
- GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN, /*< desc="Darken only" >*/
- GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN, /*< desc="Lighten only" >*/
- GIMP_LAYER_MODE_HSV_HUE_BROKEN, /*< desc="Hue (HSV)" >*/
- GIMP_LAYER_MODE_HSV_SATURATION_BROKEN, /*< desc="Saturation (HSV)" >*/
- GIMP_LAYER_MODE_HSV_COLOR_BROKEN, /*< desc="Color (HSV)" >*/
- GIMP_LAYER_MODE_HSV_VALUE_BROKEN, /*< desc="Value (HSV)" >*/
- GIMP_LAYER_MODE_DIVIDE_BROKEN, /*< desc="Divide" >*/
- GIMP_LAYER_MODE_DODGE_BROKEN, /*< desc="Dodge" >*/
- GIMP_LAYER_MODE_BURN_BROKEN, /*< desc="Burn" >*/
- GIMP_LAYER_MODE_HARDLIGHT_BROKEN, /*< desc="Hard light" >*/
- GIMP_LAYER_MODE_SOFTLIGHT_BROKEN, /*< desc="Soft light" >*/
- GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN, /*< desc="Grain extract" >*/
- GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN, /*< desc="Grain merge" >*/
+ GIMP_LAYER_MODE_MULTIPLY_LEGACY, /*< desc="Multiply" >*/
+ GIMP_LAYER_MODE_SCREEN_LEGACY, /*< desc="Screen" >*/
+ GIMP_LAYER_MODE_OVERLAY_LEGACY, /*< desc="Old broken Overlay" >*/
+ GIMP_LAYER_MODE_DIFFERENCE_LEGACY, /*< desc="Difference" >*/
+ GIMP_LAYER_MODE_ADDITION_LEGACY, /*< desc="Addition" >*/
+ GIMP_LAYER_MODE_SUBTRACT_LEGACY, /*< desc="Subtract" >*/
+ GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, /*< desc="Darken only" >*/
+ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, /*< desc="Lighten only" >*/
+ GIMP_LAYER_MODE_HSV_HUE_LEGACY, /*< desc="Hue (HSV)" >*/
+ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, /*< desc="Saturation (HSV)" >*/
+ GIMP_LAYER_MODE_HSV_COLOR_LEGACY, /*< desc="Color (HSV)" >*/
+ GIMP_LAYER_MODE_HSV_VALUE_LEGACY, /*< desc="Value (HSV)" >*/
+ GIMP_LAYER_MODE_DIVIDE_LEGACY, /*< desc="Divide" >*/
+ GIMP_LAYER_MODE_DODGE_LEGACY, /*< desc="Dodge" >*/
+ GIMP_LAYER_MODE_BURN_LEGACY, /*< desc="Burn" >*/
+ GIMP_LAYER_MODE_HARDLIGHT_LEGACY, /*< desc="Hard light" >*/
+ GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, /*< desc="Soft light" >*/
+ GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, /*< desc="Grain extract" >*/
+ GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, /*< desc="Grain merge" >*/
GIMP_LAYER_MODE_COLOR_ERASE, /*< desc="Color erase" >*/
GIMP_LAYER_MODE_OVERLAY, /*< desc="Overlay" >*/
GIMP_LAYER_MODE_LCH_HUE, /*< desc="Hue (LCH)" >*/
diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c
index 34a9b8b..ef9ae50 100644
--- a/app/core/gimpcontext.c
+++ b/app/core/gimpcontext.c
@@ -1347,9 +1347,9 @@ gimp_context_deserialize (GimpConfig *config,
if (context->paint_mode != old_paint_mode)
{
- if (context->paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
+ if (context->paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
g_object_set (context,
- "paint-mode", GIMP_LAYER_MODE_SOFTLIGHT_BROKEN,
+ "paint-mode", GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
NULL);
}
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 14cb056..f400f9c 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -2394,9 +2394,9 @@ gimp_image_get_xcf_version (GimpImage *image,
switch (gimp_layer_get_mode (layer))
{
/* new layer modes not supported by gimp-1.2 */
- case GIMP_LAYER_MODE_SOFTLIGHT_BROKEN:
- case GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN:
- case GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN:
+ case GIMP_LAYER_MODE_SOFTLIGHT_LEGACY:
+ case GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY:
+ case GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY:
case GIMP_LAYER_MODE_COLOR_ERASE:
version = MAX (2, version);
break;
diff --git a/app/gegl/gimp-gegl-nodes.c b/app/gegl/gimp-gegl-nodes.c
index f717e71..ded1720 100644
--- a/app/gegl/gimp-gegl-nodes.c
+++ b/app/gegl/gimp-gegl-nodes.c
@@ -162,79 +162,79 @@ gimp_gegl_mode_node_set_mode (GeglNode *node,
operation = "gimp:behind-mode";
break;
- case GIMP_LAYER_MODE_MULTIPLY_BROKEN:
+ case GIMP_LAYER_MODE_MULTIPLY_LEGACY:
operation = "gimp:multiply-mode";
break;
- case GIMP_LAYER_MODE_SCREEN_BROKEN:
+ case GIMP_LAYER_MODE_SCREEN_LEGACY:
operation = "gimp:screen-mode";
break;
- case GIMP_LAYER_MODE_OVERLAY_BROKEN:
+ case GIMP_LAYER_MODE_OVERLAY_LEGACY:
operation = "gimp:softlight-mode";
break;
- case GIMP_LAYER_MODE_DIFFERENCE_BROKEN:
+ case GIMP_LAYER_MODE_DIFFERENCE_LEGACY:
operation = "gimp:difference-mode";
break;
- case GIMP_LAYER_MODE_ADDITION_BROKEN:
+ case GIMP_LAYER_MODE_ADDITION_LEGACY:
operation = "gimp:addition-mode";
break;
- case GIMP_LAYER_MODE_SUBTRACT_BROKEN:
+ case GIMP_LAYER_MODE_SUBTRACT_LEGACY:
operation = "gimp:subtract-mode";
break;
- case GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN:
+ case GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY:
operation = "gimp:darken-only-mode";
break;
- case GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN:
+ case GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY:
operation = "gimp:lighten-only-mode";
break;
- case GIMP_LAYER_MODE_HSV_HUE_BROKEN:
+ case GIMP_LAYER_MODE_HSV_HUE_LEGACY:
operation = "gimp:hue-mode";
break;
- case GIMP_LAYER_MODE_HSV_SATURATION_BROKEN:
+ case GIMP_LAYER_MODE_HSV_SATURATION_LEGACY:
operation = "gimp:saturation-mode";
break;
- case GIMP_LAYER_MODE_HSV_COLOR_BROKEN:
+ case GIMP_LAYER_MODE_HSV_COLOR_LEGACY:
operation = "gimp:color-mode";
break;
- case GIMP_LAYER_MODE_HSV_VALUE_BROKEN:
+ case GIMP_LAYER_MODE_HSV_VALUE_LEGACY:
operation = "gimp:value-mode";
break;
- case GIMP_LAYER_MODE_DIVIDE_BROKEN:
+ case GIMP_LAYER_MODE_DIVIDE_LEGACY:
operation = "gimp:divide-mode";
break;
- case GIMP_LAYER_MODE_DODGE_BROKEN:
+ case GIMP_LAYER_MODE_DODGE_LEGACY:
operation = "gimp:dodge-mode";
break;
- case GIMP_LAYER_MODE_BURN_BROKEN:
+ case GIMP_LAYER_MODE_BURN_LEGACY:
operation = "gimp:burn-mode";
break;
- case GIMP_LAYER_MODE_HARDLIGHT_BROKEN:
+ case GIMP_LAYER_MODE_HARDLIGHT_LEGACY:
operation = "gimp:hardlight-mode";
break;
- case GIMP_LAYER_MODE_SOFTLIGHT_BROKEN:
+ case GIMP_LAYER_MODE_SOFTLIGHT_LEGACY:
operation = "gimp:softlight-mode";
break;
- case GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN:
+ case GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY:
operation = "gimp:grain-extract-mode";
break;
- case GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN:
+ case GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY:
operation = "gimp:grain-merge-mode";
break;
diff --git a/app/operations/gimplayermodefunctions.c b/app/operations/gimplayermodefunctions.c
index 824cb55..a5337fe 100644
--- a/app/operations/gimplayermodefunctions.c
+++ b/app/operations/gimplayermodefunctions.c
@@ -78,79 +78,79 @@ get_layer_mode_function (GimpLayerMode paint_mode,
func = gimp_operation_behind_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_MULTIPLY_BROKEN:
+ case GIMP_LAYER_MODE_MULTIPLY_LEGACY:
func = gimp_operation_multiply_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_SCREEN_BROKEN:
+ case GIMP_LAYER_MODE_SCREEN_LEGACY:
func = gimp_operation_screen_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_OVERLAY_BROKEN:
+ case GIMP_LAYER_MODE_OVERLAY_LEGACY:
func = gimp_operation_softlight_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_DIFFERENCE_BROKEN:
+ case GIMP_LAYER_MODE_DIFFERENCE_LEGACY:
func = gimp_operation_difference_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_ADDITION_BROKEN:
+ case GIMP_LAYER_MODE_ADDITION_LEGACY:
func = gimp_operation_addition_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_SUBTRACT_BROKEN:
+ case GIMP_LAYER_MODE_SUBTRACT_LEGACY:
func = gimp_operation_subtract_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN:
+ case GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY:
func = gimp_operation_darken_only_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN:
+ case GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY:
func = gimp_operation_lighten_only_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_HSV_HUE_BROKEN:
+ case GIMP_LAYER_MODE_HSV_HUE_LEGACY:
func = gimp_operation_hue_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_HSV_SATURATION_BROKEN:
+ case GIMP_LAYER_MODE_HSV_SATURATION_LEGACY:
func = gimp_operation_saturation_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_HSV_COLOR_BROKEN:
+ case GIMP_LAYER_MODE_HSV_COLOR_LEGACY:
func = gimp_operation_color_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_HSV_VALUE_BROKEN:
+ case GIMP_LAYER_MODE_HSV_VALUE_LEGACY:
func = gimp_operation_value_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_DIVIDE_BROKEN:
+ case GIMP_LAYER_MODE_DIVIDE_LEGACY:
func = gimp_operation_divide_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_DODGE_BROKEN:
+ case GIMP_LAYER_MODE_DODGE_LEGACY:
func = gimp_operation_dodge_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_BURN_BROKEN:
+ case GIMP_LAYER_MODE_BURN_LEGACY:
func = gimp_operation_burn_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_HARDLIGHT_BROKEN:
+ case GIMP_LAYER_MODE_HARDLIGHT_LEGACY:
func = gimp_operation_hardlight_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_SOFTLIGHT_BROKEN:
+ case GIMP_LAYER_MODE_SOFTLIGHT_LEGACY:
func = gimp_operation_softlight_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN:
+ case GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY:
func = gimp_operation_grain_extract_mode_process_pixels;
break;
- case GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN:
+ case GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY:
func = gimp_operation_grain_merge_mode_process_pixels;
break;
diff --git a/app/pdb/brush-select-cmds.c b/app/pdb/brush-select-cmds.c
index b5a7c01..86bd7ae 100644
--- a/app/pdb/brush-select-cmds.c
+++ b/app/pdb/brush-select-cmds.c
@@ -61,8 +61,8 @@ brushes_popup_invoker (GimpProcedure *procedure,
if (success)
{
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
if (gimp->no_interface ||
! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
@@ -129,8 +129,8 @@ brushes_set_popup_invoker (GimpProcedure *procedure,
if (success)
{
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
if (gimp->no_interface ||
! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
diff --git a/app/pdb/brushes-cmds.c b/app/pdb/brushes-cmds.c
index a5b4119..e03c898 100644
--- a/app/pdb/brushes-cmds.c
+++ b/app/pdb/brushes-cmds.c
@@ -207,8 +207,8 @@ brushes_get_brush_data_invoker (GimpProcedure *procedure,
{
GimpBrush *brush;
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
if (name && strlen (name))
brush = gimp_pdb_get_brush (gimp, name, FALSE, error);
diff --git a/app/pdb/context-cmds.c b/app/pdb/context-cmds.c
index f31cda7..6fc4288 100644
--- a/app/pdb/context-cmds.c
+++ b/app/pdb/context-cmds.c
@@ -419,8 +419,8 @@ context_set_paint_mode_invoker (GimpProcedure *procedure,
if (success)
{
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_context_set_paint_mode (context, paint_mode);
}
diff --git a/app/pdb/edit-cmds.c b/app/pdb/edit-cmds.c
index 47841cd..bf3f0ec 100644
--- a/app/pdb/edit-cmds.c
+++ b/app/pdb/edit-cmds.c
@@ -621,8 +621,8 @@ edit_bucket_fill_invoker (GimpProcedure *procedure,
if (gimp_fill_options_set_by_fill_mode (options, context,
fill_mode, error))
{
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_context_set_opacity (GIMP_CONTEXT (options), opacity / 100.0);
gimp_context_set_paint_mode (GIMP_CONTEXT (options), paint_mode);
@@ -698,8 +698,8 @@ edit_bucket_fill_full_invoker (GimpProcedure *procedure,
if (gimp_fill_options_set_by_fill_mode (options, context,
fill_mode, error))
{
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_context_set_opacity (GIMP_CONTEXT (options), opacity / 100.0);
gimp_context_set_paint_mode (GIMP_CONTEXT (options), paint_mode);
@@ -794,8 +794,8 @@ edit_blend_invoker (GimpProcedure *procedure,
{
GimpGradient *gradient;
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
if (progress)
gimp_progress_start (progress, FALSE, _("Blending"));
diff --git a/app/pdb/layer-cmds.c b/app/pdb/layer-cmds.c
index 3372e58..4126217 100644
--- a/app/pdb/layer-cmds.c
+++ b/app/pdb/layer-cmds.c
@@ -88,8 +88,8 @@ layer_new_invoker (GimpProcedure *procedure,
gboolean has_alpha = FALSE;
const Babl *format;
- if (mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
switch (type)
{
@@ -1140,8 +1140,8 @@ layer_set_mode_invoker (GimpProcedure *procedure,
if (success)
{
- if (mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_layer_set_mode (layer, mode, TRUE);
}
diff --git a/app/tests/test-xcf.c b/app/tests/test-xcf.c
index 1988ff9..ba2e514 100644
--- a/app/tests/test-xcf.c
+++ b/app/tests/test-xcf.c
@@ -75,7 +75,7 @@
#define GIMP_MAINIMAGE_LAYER2_HEIGHT 251
#define GIMP_MAINIMAGE_LAYER2_FORMAT babl_format ("R'G'B' u8")
#define GIMP_MAINIMAGE_LAYER2_OPACITY GIMP_OPACITY_TRANSPARENT
-#define GIMP_MAINIMAGE_LAYER2_MODE GIMP_LAYER_MODE_MULTIPLY_BROKEN
+#define GIMP_MAINIMAGE_LAYER2_MODE GIMP_LAYER_MODE_MULTIPLY_LEGACY
#define GIMP_MAINIMAGE_GROUP1_NAME "group1"
diff --git a/app/widgets/gimpwidgets-constructors.c b/app/widgets/gimpwidgets-constructors.c
index 46f7d70..780342e 100644
--- a/app/widgets/gimpwidgets-constructors.c
+++ b/app/widgets/gimpwidgets-constructors.c
@@ -108,29 +108,29 @@ gimp_paint_mode_menu_new (gboolean with_behind_mode,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_DISSOLVE,
- GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN,
- GIMP_LAYER_MODE_SCREEN_BROKEN,
- GIMP_LAYER_MODE_DODGE_BROKEN,
- GIMP_LAYER_MODE_ADDITION_BROKEN,
+ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
+ GIMP_LAYER_MODE_SCREEN_LEGACY,
+ GIMP_LAYER_MODE_DODGE_LEGACY,
+ GIMP_LAYER_MODE_ADDITION_LEGACY,
- GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN,
- GIMP_LAYER_MODE_MULTIPLY_BROKEN,
- GIMP_LAYER_MODE_BURN_BROKEN,
+ GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,
+ GIMP_LAYER_MODE_MULTIPLY_LEGACY,
+ GIMP_LAYER_MODE_BURN_LEGACY,
GIMP_LAYER_MODE_OVERLAY,
- GIMP_LAYER_MODE_SOFTLIGHT_BROKEN,
- GIMP_LAYER_MODE_HARDLIGHT_BROKEN,
+ GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
+ GIMP_LAYER_MODE_HARDLIGHT_LEGACY,
- GIMP_LAYER_MODE_DIFFERENCE_BROKEN,
- GIMP_LAYER_MODE_SUBTRACT_BROKEN,
- GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN,
- GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN,
- GIMP_LAYER_MODE_DIVIDE_BROKEN,
+ GIMP_LAYER_MODE_DIFFERENCE_LEGACY,
+ GIMP_LAYER_MODE_SUBTRACT_LEGACY,
+ GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,
+ GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,
+ GIMP_LAYER_MODE_DIVIDE_LEGACY,
- GIMP_LAYER_MODE_HSV_HUE_BROKEN,
- GIMP_LAYER_MODE_HSV_SATURATION_BROKEN,
- GIMP_LAYER_MODE_HSV_COLOR_BROKEN,
- GIMP_LAYER_MODE_HSV_VALUE_BROKEN,
+ GIMP_LAYER_MODE_HSV_HUE_LEGACY,
+ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
+ GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
+ GIMP_LAYER_MODE_HSV_VALUE_LEGACY,
GIMP_LAYER_MODE_LCH_HUE,
GIMP_LAYER_MODE_LCH_CHROMA,
@@ -141,19 +141,19 @@ gimp_paint_mode_menu_new (gboolean with_behind_mode,
GIMP_LAYER_MODE_DISSOLVE, -1);
gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
- GIMP_LAYER_MODE_ADDITION_BROKEN, -1);
+ GIMP_LAYER_MODE_ADDITION_LEGACY, -1);
gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
- GIMP_LAYER_MODE_BURN_BROKEN, -1);
+ GIMP_LAYER_MODE_BURN_LEGACY, -1);
gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
- GIMP_LAYER_MODE_HARDLIGHT_BROKEN, -1);
+ GIMP_LAYER_MODE_HARDLIGHT_LEGACY, -1);
gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
- GIMP_LAYER_MODE_DIVIDE_BROKEN, -1);
+ GIMP_LAYER_MODE_DIVIDE_LEGACY, -1);
gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
- GIMP_LAYER_MODE_HSV_VALUE_BROKEN, -1);
+ GIMP_LAYER_MODE_HSV_VALUE_LEGACY, -1);
if (with_behind_mode)
{
diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c
index 33c1be2..c0523c6 100644
--- a/app/xcf/xcf-load.c
+++ b/app/xcf/xcf-load.c
@@ -1093,8 +1093,8 @@ xcf_load_layer_props (XcfInfo *info,
info->cp += xcf_read_int32 (info->input, &mode, 1);
- if (mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_layer_set_mode (*layer, (GimpLayerMode) mode, FALSE);
}
diff --git a/app/xcf/xcf-save.c b/app/xcf/xcf-save.c
index f49c214..c43726d 100644
--- a/app/xcf/xcf-save.c
+++ b/app/xcf/xcf-save.c
@@ -726,8 +726,8 @@ xcf_save_prop (XcfInfo *info,
mode = va_arg (args, gint32);
size = 4;
- if (mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
xcf_write_prop_type_check_error (info, prop_type);
xcf_write_int32_check_error (info, &size, 1);
diff --git a/libgimp/gimpenums.h b/libgimp/gimpenums.h
index fcaeef5..0effb53 100644
--- a/libgimp/gimpenums.h
+++ b/libgimp/gimpenums.h
@@ -72,25 +72,25 @@ typedef enum
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_BEHIND,
- GIMP_LAYER_MODE_MULTIPLY_BROKEN,
- GIMP_LAYER_MODE_SCREEN_BROKEN,
- GIMP_LAYER_MODE_OVERLAY_BROKEN,
- GIMP_LAYER_MODE_DIFFERENCE_BROKEN,
- GIMP_LAYER_MODE_ADDITION_BROKEN,
- GIMP_LAYER_MODE_SUBTRACT_BROKEN,
- GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN,
- GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN,
- GIMP_LAYER_MODE_HSV_HUE_BROKEN,
- GIMP_LAYER_MODE_HSV_SATURATION_BROKEN,
- GIMP_LAYER_MODE_HSV_COLOR_BROKEN,
- GIMP_LAYER_MODE_HSV_VALUE_BROKEN,
- GIMP_LAYER_MODE_DIVIDE_BROKEN,
- GIMP_LAYER_MODE_DODGE_BROKEN,
- GIMP_LAYER_MODE_BURN_BROKEN,
- GIMP_LAYER_MODE_HARDLIGHT_BROKEN,
- GIMP_LAYER_MODE_SOFTLIGHT_BROKEN,
- GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN,
- GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN,
+ GIMP_LAYER_MODE_MULTIPLY_LEGACY,
+ GIMP_LAYER_MODE_SCREEN_LEGACY,
+ GIMP_LAYER_MODE_OVERLAY_LEGACY,
+ GIMP_LAYER_MODE_DIFFERENCE_LEGACY,
+ GIMP_LAYER_MODE_ADDITION_LEGACY,
+ GIMP_LAYER_MODE_SUBTRACT_LEGACY,
+ GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,
+ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
+ GIMP_LAYER_MODE_HSV_HUE_LEGACY,
+ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
+ GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
+ GIMP_LAYER_MODE_HSV_VALUE_LEGACY,
+ GIMP_LAYER_MODE_DIVIDE_LEGACY,
+ GIMP_LAYER_MODE_DODGE_LEGACY,
+ GIMP_LAYER_MODE_BURN_LEGACY,
+ GIMP_LAYER_MODE_HARDLIGHT_LEGACY,
+ GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
+ GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,
+ GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,
GIMP_LAYER_MODE_COLOR_ERASE,
GIMP_LAYER_MODE_OVERLAY,
GIMP_LAYER_MODE_LCH_HUE,
diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c
index 82a97e1..13ccce7 100644
--- a/plug-ins/common/file-psp.c
+++ b/plug-ins/common/file-psp.c
@@ -995,28 +995,28 @@ gimp_layer_mode_from_psp_blend_mode (PSPBlendModes mode)
return GIMP_LAYER_MODE_NORMAL;
case PSP_BLEND_DARKEN:
- return GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN;
+ return GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY;
case PSP_BLEND_LIGHTEN:
- return GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN;
+ return GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY;
case PSP_BLEND_HUE:
- return GIMP_LAYER_MODE_HSV_HUE_BROKEN;
+ return GIMP_LAYER_MODE_HSV_HUE_LEGACY;
case PSP_BLEND_SATURATION:
- return GIMP_LAYER_MODE_HSV_SATURATION_BROKEN;
+ return GIMP_LAYER_MODE_HSV_SATURATION_LEGACY;
case PSP_BLEND_COLOR:
- return GIMP_LAYER_MODE_HSV_COLOR_BROKEN;
+ return GIMP_LAYER_MODE_HSV_COLOR_LEGACY;
case PSP_BLEND_LUMINOSITY:
- return GIMP_LAYER_MODE_HSV_VALUE_BROKEN; /* ??? */
+ return GIMP_LAYER_MODE_HSV_VALUE_LEGACY; /* ??? */
case PSP_BLEND_MULTIPLY:
- return GIMP_LAYER_MODE_MULTIPLY_BROKEN;
+ return GIMP_LAYER_MODE_MULTIPLY_LEGACY;
case PSP_BLEND_SCREEN:
- return GIMP_LAYER_MODE_SCREEN_BROKEN;
+ return GIMP_LAYER_MODE_SCREEN_LEGACY;
case PSP_BLEND_DISSOLVE:
return GIMP_LAYER_MODE_DISSOLVE;
@@ -1025,19 +1025,19 @@ gimp_layer_mode_from_psp_blend_mode (PSPBlendModes mode)
return GIMP_LAYER_MODE_OVERLAY;
case PSP_BLEND_HARD_LIGHT:
- return GIMP_LAYER_MODE_HARDLIGHT_BROKEN;
+ return GIMP_LAYER_MODE_HARDLIGHT_LEGACY;
case PSP_BLEND_SOFT_LIGHT:
- return GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ return GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
case PSP_BLEND_DIFFERENCE:
- return GIMP_LAYER_MODE_DIFFERENCE_BROKEN;
+ return GIMP_LAYER_MODE_DIFFERENCE_LEGACY;
case PSP_BLEND_DODGE:
- return GIMP_LAYER_MODE_DODGE_BROKEN;
+ return GIMP_LAYER_MODE_DODGE_LEGACY;
case PSP_BLEND_BURN:
- return GIMP_LAYER_MODE_BURN_BROKEN;
+ return GIMP_LAYER_MODE_BURN_LEGACY;
case PSP_BLEND_EXCLUSION:
return -1; /* ??? */
diff --git a/plug-ins/file-psd/psd-save.c b/plug-ins/file-psd/psd-save.c
index 2fce841..df7e67f 100644
--- a/plug-ins/file-psd/psd-save.c
+++ b/plug-ins/file-psd/psd-save.c
@@ -199,44 +199,44 @@ psd_lmode_layer (gint32 idLayer,
case GIMP_LAYER_MODE_NORMAL:
strcpy (psdMode, "norm");
break;
- case GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN:
+ case GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY:
strcpy (psdMode, "dark");
break;
- case GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN:
+ case GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY:
strcpy (psdMode, "lite");
break;
- case GIMP_LAYER_MODE_HSV_HUE_BROKEN:
+ case GIMP_LAYER_MODE_HSV_HUE_LEGACY:
strcpy (psdMode, "hue ");
break;
- case GIMP_LAYER_MODE_HSV_SATURATION_BROKEN:
+ case GIMP_LAYER_MODE_HSV_SATURATION_LEGACY:
strcpy (psdMode, "sat ");
break;
- case GIMP_LAYER_MODE_HSV_COLOR_BROKEN:
+ case GIMP_LAYER_MODE_HSV_COLOR_LEGACY:
strcpy (psdMode, "colr");
break;
- case GIMP_LAYER_MODE_ADDITION_BROKEN:
+ case GIMP_LAYER_MODE_ADDITION_LEGACY:
strcpy (psdMode, "lddg");
break;
- case GIMP_LAYER_MODE_MULTIPLY_BROKEN:
+ case GIMP_LAYER_MODE_MULTIPLY_LEGACY:
strcpy (psdMode, "mul ");
break;
- case GIMP_LAYER_MODE_SCREEN_BROKEN:
+ case GIMP_LAYER_MODE_SCREEN_LEGACY:
strcpy (psdMode, "scrn");
break;
case GIMP_LAYER_MODE_DISSOLVE:
strcpy (psdMode, "diss");
break;
- case GIMP_LAYER_MODE_DIFFERENCE_BROKEN:
+ case GIMP_LAYER_MODE_DIFFERENCE_LEGACY:
strcpy (psdMode, "diff");
break;
- case GIMP_LAYER_MODE_HSV_VALUE_BROKEN: /* ? */
+ case GIMP_LAYER_MODE_HSV_VALUE_LEGACY: /* ? */
strcpy (psdMode, "lum ");
break;
- case GIMP_LAYER_MODE_HARDLIGHT_BROKEN:
+ case GIMP_LAYER_MODE_HARDLIGHT_LEGACY:
strcpy (psdMode, "hLit");
break;
- case GIMP_LAYER_MODE_OVERLAY_BROKEN:
- case GIMP_LAYER_MODE_SOFTLIGHT_BROKEN:
+ case GIMP_LAYER_MODE_OVERLAY_LEGACY:
+ case GIMP_LAYER_MODE_SOFTLIGHT_LEGACY:
strcpy (psdMode, "sLit");
break;
case GIMP_LAYER_MODE_OVERLAY:
diff --git a/plug-ins/file-psd/psd-util.c b/plug-ins/file-psd/psd-util.c
index 69395e4..2e5a2f0 100644
--- a/plug-ins/file-psd/psd-util.c
+++ b/plug-ins/file-psd/psd-util.c
@@ -611,11 +611,11 @@ psd_to_gimp_blend_mode (const gchar *psd_mode)
if (g_ascii_strncasecmp (psd_mode, "norm", 4) == 0) /* Normal (ps3) */
return GIMP_LAYER_MODE_NORMAL;
if (g_ascii_strncasecmp (psd_mode, "dark", 4) == 0) /* Darken (ps3) */
- return GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN;
+ return GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY;
if (g_ascii_strncasecmp (psd_mode, "lite", 4) == 0) /* Lighten (ps3) */
- return GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN;
+ return GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY;
if (g_ascii_strncasecmp (psd_mode, "hue ", 4) == 0) /* Hue (ps3) */
- return GIMP_LAYER_MODE_HSV_HUE_BROKEN;
+ return GIMP_LAYER_MODE_HSV_HUE_LEGACY;
if (g_ascii_strncasecmp (psd_mode, "sat ", 4) == 0) /* Saturation (ps3) */
{
if (CONVERSION_WARNINGS)
@@ -625,10 +625,10 @@ psd_to_gimp_blend_mode (const gchar *psd_mode)
"blend mode: %s. Results will differ.",
mode_name);
}
- return GIMP_LAYER_MODE_HSV_SATURATION_BROKEN;
+ return GIMP_LAYER_MODE_HSV_SATURATION_LEGACY;
}
if (g_ascii_strncasecmp (psd_mode, "colr", 4) == 0) /* Color (ps3) */
- return GIMP_LAYER_MODE_HSV_COLOR_BROKEN;
+ return GIMP_LAYER_MODE_HSV_COLOR_LEGACY;
if (g_ascii_strncasecmp (psd_mode, "lum ", 4) == 0) /* Luminosity (ps3) */
{
if (CONVERSION_WARNINGS)
@@ -638,20 +638,20 @@ psd_to_gimp_blend_mode (const gchar *psd_mode)
"blend mode: %s. Results will differ.",
mode_name);
}
- return GIMP_LAYER_MODE_HSV_VALUE_BROKEN;
+ return GIMP_LAYER_MODE_HSV_VALUE_LEGACY;
}
if (g_ascii_strncasecmp (psd_mode, "mul ", 4) == 0) /* Multiply (ps3) */
- return GIMP_LAYER_MODE_MULTIPLY_BROKEN;
+ return GIMP_LAYER_MODE_MULTIPLY_LEGACY;
if (g_ascii_strncasecmp (psd_mode, "lddg", 4) == 0) /* Linear Dodge (cs2) */
- return GIMP_LAYER_MODE_ADDITION_BROKEN;
+ return GIMP_LAYER_MODE_ADDITION_LEGACY;
if (g_ascii_strncasecmp (psd_mode, "scrn", 4) == 0) /* Screen (ps3) */
- return GIMP_LAYER_MODE_SCREEN_BROKEN;
+ return GIMP_LAYER_MODE_SCREEN_LEGACY;
if (g_ascii_strncasecmp (psd_mode, "diss", 4) == 0) /* Dissolve (ps3) */
return GIMP_LAYER_MODE_DISSOLVE;
if (g_ascii_strncasecmp (psd_mode, "over", 4) == 0) /* Overlay (ps3) */
return GIMP_LAYER_MODE_OVERLAY;
if (g_ascii_strncasecmp (psd_mode, "hLit", 4) == 0) /* Hard light (ps3) */
- return GIMP_LAYER_MODE_HARDLIGHT_BROKEN;
+ return GIMP_LAYER_MODE_HARDLIGHT_LEGACY;
if (g_ascii_strncasecmp (psd_mode, "sLit", 4) == 0) /* Soft light (ps3) */
{
if (CONVERSION_WARNINGS)
@@ -661,10 +661,10 @@ psd_to_gimp_blend_mode (const gchar *psd_mode)
"blend mode: %s. Results will differ.",
mode_name);
}
- return GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ return GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
}
if (g_ascii_strncasecmp (psd_mode, "diff", 4) == 0) /* Difference (ps3) */
- return GIMP_LAYER_MODE_DIFFERENCE_BROKEN;
+ return GIMP_LAYER_MODE_DIFFERENCE_LEGACY;
if (g_ascii_strncasecmp (psd_mode, "smud", 4) == 0) /* Exclusion (ps6) */
{
if (CONVERSION_WARNINGS)
@@ -676,9 +676,9 @@ psd_to_gimp_blend_mode (const gchar *psd_mode)
return GIMP_LAYER_MODE_NORMAL;
}
if (g_ascii_strncasecmp (psd_mode, "div ", 4) == 0) /* Color dodge (ps6) */
- return GIMP_LAYER_MODE_DODGE_BROKEN;
+ return GIMP_LAYER_MODE_DODGE_LEGACY;
if (g_ascii_strncasecmp (psd_mode, "idiv", 4) == 0) /* Color burn (ps6) */
- return GIMP_LAYER_MODE_BURN_BROKEN;
+ return GIMP_LAYER_MODE_BURN_LEGACY;
if (g_ascii_strncasecmp (psd_mode, "lbrn", 4) == 0) /* Linear burn (ps7)*/
{
if (CONVERSION_WARNINGS)
@@ -690,7 +690,7 @@ psd_to_gimp_blend_mode (const gchar *psd_mode)
return GIMP_LAYER_MODE_NORMAL;
}
if (g_ascii_strncasecmp (psd_mode, "lddg", 4) == 0) /* Linear dodge (ps7)*/
- return GIMP_LAYER_MODE_ADDITION_BROKEN;
+ return GIMP_LAYER_MODE_ADDITION_LEGACY;
if (g_ascii_strncasecmp (psd_mode, "lLit", 4) == 0) /* Linear light (ps7)*/
{
if (CONVERSION_WARNINGS)
@@ -761,82 +761,82 @@ gimp_to_psd_blend_mode (GimpLayerMode gimp_layer_mode)
gimp_layer_mode_effects_name (gimp_layer_mode));
psd_mode = g_strndup ("norm", 4);
break;
- case GIMP_LAYER_MODE_MULTIPLY_BROKEN:
+ case GIMP_LAYER_MODE_MULTIPLY_LEGACY:
psd_mode = g_strndup ("mul ", 4); /* Multiply (ps3) */
break;
- case GIMP_LAYER_MODE_SCREEN_BROKEN:
+ case GIMP_LAYER_MODE_SCREEN_LEGACY:
psd_mode = g_strndup ("scrn", 4); /* Screen (ps3) */
break;
case GIMP_LAYER_MODE_OVERLAY:
psd_mode = g_strndup ("over", 4); /* Overlay (ps3) */
break;
- case GIMP_LAYER_MODE_DIFFERENCE_BROKEN:
+ case GIMP_LAYER_MODE_DIFFERENCE_LEGACY:
psd_mode = g_strndup ("diff", 4); /* Difference (ps3) */
break;
- case GIMP_LAYER_MODE_ADDITION_BROKEN:
+ case GIMP_LAYER_MODE_ADDITION_LEGACY:
psd_mode = g_strndup ("lddg", 4); /* Linear dodge (ps7)*/
break;
- case GIMP_LAYER_MODE_SUBTRACT_BROKEN:
+ case GIMP_LAYER_MODE_SUBTRACT_LEGACY:
if (CONVERSION_WARNINGS)
g_message ("Unsupported blend mode: %s. Mode reverts to normal",
gimp_layer_mode_effects_name (gimp_layer_mode));
psd_mode = g_strndup ("norm", 4);
break;
- case GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN:
+ case GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY:
psd_mode = g_strndup ("dark", 4); /* Darken (ps3) */
break;
- case GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN:
+ case GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY:
psd_mode = g_strndup ("lite", 4); /* Lighten (ps3) */
break;
- case GIMP_LAYER_MODE_HSV_HUE_BROKEN:
+ case GIMP_LAYER_MODE_HSV_HUE_LEGACY:
psd_mode = g_strndup ("hue ", 4); /* Hue (ps3) */
break;
- case GIMP_LAYER_MODE_HSV_SATURATION_BROKEN:
+ case GIMP_LAYER_MODE_HSV_SATURATION_LEGACY:
if (CONVERSION_WARNINGS)
g_message ("Gimp uses a different equation to photoshop for "
"blend mode: %s. Results will differ.",
gimp_layer_mode_effects_name (gimp_layer_mode));
psd_mode = g_strndup ("sat ", 4); /* Saturation (ps3) */
break;
- case GIMP_LAYER_MODE_HSV_COLOR_BROKEN:
+ case GIMP_LAYER_MODE_HSV_COLOR_LEGACY:
psd_mode = g_strndup ("colr", 4); /* Color (ps3) */
break;
- case GIMP_LAYER_MODE_HSV_VALUE_BROKEN:
+ case GIMP_LAYER_MODE_HSV_VALUE_LEGACY:
if (CONVERSION_WARNINGS)
g_message ("Gimp uses a different equation to photoshop for "
"blend mode: %s. Results will differ.",
gimp_layer_mode_effects_name (gimp_layer_mode));
psd_mode = g_strndup ("lum ", 4); /* Luminosity (ps3) */
break;
- case GIMP_LAYER_MODE_DIVIDE_BROKEN:
+ case GIMP_LAYER_MODE_DIVIDE_LEGACY:
if (CONVERSION_WARNINGS)
g_message ("Unsupported blend mode: %s. Mode reverts to normal",
gimp_layer_mode_effects_name (gimp_layer_mode));
psd_mode = g_strndup ("norm", 4);
break;
- case GIMP_LAYER_MODE_DODGE_BROKEN:
+ case GIMP_LAYER_MODE_DODGE_LEGACY:
psd_mode = g_strndup ("div ", 4); /* Color Dodge (ps6) */
break;
- case GIMP_LAYER_MODE_BURN_BROKEN:
+ case GIMP_LAYER_MODE_BURN_LEGACY:
psd_mode = g_strndup ("idiv", 4); /* Color Burn (ps6) */
break;
- case GIMP_LAYER_MODE_HARDLIGHT_BROKEN:
+ case GIMP_LAYER_MODE_HARDLIGHT_LEGACY:
psd_mode = g_strndup ("hLit", 4); /* Hard Light (ps3) */
break;
- case GIMP_LAYER_MODE_OVERLAY_BROKEN:
- case GIMP_LAYER_MODE_SOFTLIGHT_BROKEN:
+ case GIMP_LAYER_MODE_OVERLAY_LEGACY:
+ case GIMP_LAYER_MODE_SOFTLIGHT_LEGACY:
if (CONVERSION_WARNINGS)
g_message ("Unsupported blend mode: %s. Mode reverts to normal",
gimp_layer_mode_effects_name (gimp_layer_mode));
psd_mode = g_strndup ("sLit", 4); /* Soft Light (ps3) */
break;
- case GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN:
+ case GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY:
if (CONVERSION_WARNINGS)
g_message ("Unsupported blend mode: %s. Mode reverts to normal",
gimp_layer_mode_effects_name (gimp_layer_mode));
psd_mode = g_strndup ("norm", 4);
break;
- case GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN:
+ case GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY:
if (CONVERSION_WARNINGS)
g_message ("Unsupported blend mode: %s. Mode reverts to normal",
gimp_layer_mode_effects_name (gimp_layer_mode));
diff --git a/plug-ins/pygimp/gimpenumsmodule.c b/plug-ins/pygimp/gimpenumsmodule.c
index c830904..bcfadf5 100644
--- a/plug-ins/pygimp/gimpenumsmodule.c
+++ b/plug-ins/pygimp/gimpenumsmodule.c
@@ -189,43 +189,43 @@ add_compat_enums(PyObject *m)
PyModule_AddIntConstant (m, "BEHIND_MODE",
GIMP_LAYER_MODE_BEHIND);
PyModule_AddIntConstant (m, "MULTIPLY_MODE",
- GIMP_LAYER_MODE_MULTIPLY_BROKEN);
+ GIMP_LAYER_MODE_MULTIPLY_LEGACY);
PyModule_AddIntConstant (m, "SCREEN_MODE",
- GIMP_LAYER_MODE_SCREEN_BROKEN);
+ GIMP_LAYER_MODE_SCREEN_LEGACY);
PyModule_AddIntConstant (m, "OVERLAY_MODE",
- GIMP_LAYER_MODE_OVERLAY_BROKEN);
+ GIMP_LAYER_MODE_OVERLAY_LEGACY);
PyModule_AddIntConstant (m, "DIFFERENCE_MODE",
- GIMP_LAYER_MODE_DIFFERENCE_BROKEN);
+ GIMP_LAYER_MODE_DIFFERENCE_LEGACY);
PyModule_AddIntConstant (m, "ADDITION_MODE",
- GIMP_LAYER_MODE_ADDITION_BROKEN);
+ GIMP_LAYER_MODE_ADDITION_LEGACY);
PyModule_AddIntConstant (m, "SUBTRACT_MODE",
- GIMP_LAYER_MODE_SUBTRACT_BROKEN);
+ GIMP_LAYER_MODE_SUBTRACT_LEGACY);
PyModule_AddIntConstant (m, "DARKEN_ONLY_MODE",
- GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN);
+ GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY);
PyModule_AddIntConstant (m, "LIGHTEN_ONLY_MODE",
- GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN);
+ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY);
PyModule_AddIntConstant (m, "HUE_MODE",
- GIMP_LAYER_MODE_HSV_HUE_BROKEN);
+ GIMP_LAYER_MODE_HSV_HUE_LEGACY);
PyModule_AddIntConstant (m, "SATURATION_MODE",
- GIMP_LAYER_MODE_HSV_SATURATION_BROKEN);
+ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY);
PyModule_AddIntConstant (m, "COLOR_MODE",
- GIMP_LAYER_MODE_HSV_COLOR_BROKEN);
+ GIMP_LAYER_MODE_HSV_COLOR_LEGACY);
PyModule_AddIntConstant (m, "VALUE_MODE",
- GIMP_LAYER_MODE_HSV_VALUE_BROKEN);
+ GIMP_LAYER_MODE_HSV_VALUE_LEGACY);
PyModule_AddIntConstant (m, "DIVIDE_MODE",
- GIMP_LAYER_MODE_DIVIDE_BROKEN);
+ GIMP_LAYER_MODE_DIVIDE_LEGACY);
PyModule_AddIntConstant (m, "DODGE_MODE",
- GIMP_LAYER_MODE_DODGE_BROKEN);
+ GIMP_LAYER_MODE_DODGE_LEGACY);
PyModule_AddIntConstant (m, "BURN_MODE",
- GIMP_LAYER_MODE_BURN_BROKEN);
+ GIMP_LAYER_MODE_BURN_LEGACY);
PyModule_AddIntConstant (m, "HARDLIGHT_MODE",
- GIMP_LAYER_MODE_HARDLIGHT_BROKEN);
+ GIMP_LAYER_MODE_HARDLIGHT_LEGACY);
PyModule_AddIntConstant (m, "SOFTLIGHT_MODE",
- GIMP_LAYER_MODE_SOFTLIGHT_BROKEN);
+ GIMP_LAYER_MODE_SOFTLIGHT_LEGACY);
PyModule_AddIntConstant (m, "GRAIN_EXTRACT_MODE",
- GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN);
+ GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY);
PyModule_AddIntConstant (m, "GRAIN_MERGE_MODE",
- GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN);
+ GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY);
PyModule_AddIntConstant (m, "COLOR_ERASE_MODE",
GIMP_LAYER_MODE_COLOR_ERASE);
}
diff --git a/plug-ins/pygimp/plug-ins/file-openraster.py b/plug-ins/pygimp/plug-ins/file-openraster.py
index c3e5b81..9fa8d02 100755
--- a/plug-ins/pygimp/plug-ins/file-openraster.py
+++ b/plug-ins/pygimp/plug-ins/file-openraster.py
@@ -24,21 +24,21 @@ NESTED_STACK_END = object()
layermodes_map = {
"svg:src-over": LAYER_MODE_NORMAL,
- "svg:multiply": LAYER_MODE_MULTIPLY_BROKEN,
- "svg:screen": LAYER_MODE_SCREEN_BROKEN,
+ "svg:multiply": LAYER_MODE_MULTIPLY_LEGACY,
+ "svg:screen": LAYER_MODE_SCREEN_LEGACY,
"svg:overlay": LAYER_MODE_OVERLAY,
- "svg:darken": LAYER_MODE_DARKEN_ONLY_BROKEN,
- "svg:lighten": LAYER_MODE_LIGHTEN_ONLY_BROKEN,
- "svg:color-dodge": LAYER_MODE_DODGE_BROKEN,
- "svg:color-burn": LAYER_MODE_BURN_BROKEN,
- "svg:hard-light": LAYER_MODE_HARDLIGHT_BROKEN,
- "svg:soft-light": LAYER_MODE_SOFTLIGHT_BROKEN,
- "svg:difference": LAYER_MODE_DIFFERENCE_BROKEN,
- "svg:color": LAYER_MODE_HSV_COLOR_BROKEN,
- "svg:luminosity": LAYER_MODE_HSV_VALUE_BROKEN,
- "svg:hue": LAYER_MODE_HSV_HUE_BROKEN,
- "svg:saturation": LAYER_MODE_HSV_SATURATION_BROKEN,
- "svg:plus": LAYER_MODE_ADDITION_BROKEN,
+ "svg:darken": LAYER_MODE_DARKEN_ONLY_LEGACY,
+ "svg:lighten": LAYER_MODE_LIGHTEN_ONLY_LEGACY,
+ "svg:color-dodge": LAYER_MODE_DODGE_LEGACY,
+ "svg:color-burn": LAYER_MODE_BURN_LEGACY,
+ "svg:hard-light": LAYER_MODE_HARDLIGHT_LEGACY,
+ "svg:soft-light": LAYER_MODE_SOFTLIGHT_LEGACY,
+ "svg:difference": LAYER_MODE_DIFFERENCE_LEGACY,
+ "svg:color": LAYER_MODE_HSV_COLOR_LEGACY,
+ "svg:luminosity": LAYER_MODE_HSV_VALUE_LEGACY,
+ "svg:hue": LAYER_MODE_HSV_HUE_LEGACY,
+ "svg:saturation": LAYER_MODE_HSV_SATURATION_LEGACY,
+ "svg:plus": LAYER_MODE_ADDITION_LEGACY,
}
def reverse_map(mapping):
diff --git a/plug-ins/script-fu/scheme-wrapper.c b/plug-ins/script-fu/scheme-wrapper.c
index 7c60bbf..cc619bf 100644
--- a/plug-ins/script-fu/scheme-wrapper.c
+++ b/plug-ins/script-fu/scheme-wrapper.c
@@ -174,25 +174,25 @@ static const NamedConstant const old_constants[] =
{ "NORMAL-MODE", GIMP_LAYER_MODE_NORMAL },
{ "DISSOLVE-MODE", GIMP_LAYER_MODE_DISSOLVE },
{ "BEHIND-MODE", GIMP_LAYER_MODE_BEHIND },
- { "MULTIPLY-MODE", GIMP_LAYER_MODE_MULTIPLY_BROKEN },
- { "SCREEN-MODE", GIMP_LAYER_MODE_SCREEN_BROKEN },
- { "OVERLAY-MODE", GIMP_LAYER_MODE_OVERLAY_BROKEN },
- { "DIFFERENCE-MODE", GIMP_LAYER_MODE_DIFFERENCE_BROKEN },
- { "ADDITION-MODE", GIMP_LAYER_MODE_ADDITION_BROKEN },
- { "SUBTRACT-MODE", GIMP_LAYER_MODE_SUBTRACT_BROKEN },
- { "DARKEN-ONLY-MODE", GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN },
- { "LIGHTEN-ONLY-MODE", GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN },
- { "HUE-MODE", GIMP_LAYER_MODE_HSV_HUE_BROKEN },
- { "SATURATION-MODE", GIMP_LAYER_MODE_HSV_SATURATION_BROKEN },
- { "COLOR-MODE", GIMP_LAYER_MODE_HSV_COLOR_BROKEN },
- { "VALUE-MODE", GIMP_LAYER_MODE_HSV_VALUE_BROKEN },
- { "DIVIDE-MODE", GIMP_LAYER_MODE_DIVIDE_BROKEN },
- { "DODGE-MODE", GIMP_LAYER_MODE_DODGE_BROKEN },
- { "BURN-MODE", GIMP_LAYER_MODE_BURN_BROKEN },
- { "HARDLIGHT-MODE", GIMP_LAYER_MODE_HARDLIGHT_BROKEN },
- { "SOFTLIGHT-MODE", GIMP_LAYER_MODE_SOFTLIGHT_BROKEN },
- { "GRAIN-EXTRACT-MODE", GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN },
- { "GRAIN-MERGE-MODE", GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN },
+ { "MULTIPLY-MODE", GIMP_LAYER_MODE_MULTIPLY_LEGACY },
+ { "SCREEN-MODE", GIMP_LAYER_MODE_SCREEN_LEGACY },
+ { "OVERLAY-MODE", GIMP_LAYER_MODE_OVERLAY_LEGACY },
+ { "DIFFERENCE-MODE", GIMP_LAYER_MODE_DIFFERENCE_LEGACY },
+ { "ADDITION-MODE", GIMP_LAYER_MODE_ADDITION_LEGACY },
+ { "SUBTRACT-MODE", GIMP_LAYER_MODE_SUBTRACT_LEGACY },
+ { "DARKEN-ONLY-MODE", GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY },
+ { "LIGHTEN-ONLY-MODE", GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY },
+ { "HUE-MODE", GIMP_LAYER_MODE_HSV_HUE_LEGACY },
+ { "SATURATION-MODE", GIMP_LAYER_MODE_HSV_SATURATION_LEGACY },
+ { "COLOR-MODE", GIMP_LAYER_MODE_HSV_COLOR_LEGACY },
+ { "VALUE-MODE", GIMP_LAYER_MODE_HSV_VALUE_LEGACY },
+ { "DIVIDE-MODE", GIMP_LAYER_MODE_DIVIDE_LEGACY },
+ { "DODGE-MODE", GIMP_LAYER_MODE_DODGE_LEGACY },
+ { "BURN-MODE", GIMP_LAYER_MODE_BURN_LEGACY },
+ { "HARDLIGHT-MODE", GIMP_LAYER_MODE_HARDLIGHT_LEGACY },
+ { "SOFTLIGHT-MODE", GIMP_LAYER_MODE_SOFTLIGHT_LEGACY },
+ { "GRAIN-EXTRACT-MODE", GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY },
+ { "GRAIN-MERGE-MODE", GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY },
{ "COLOR-ERASE-MODE", GIMP_LAYER_MODE_COLOR_ERASE },
{ NULL, 0 }
diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl
index 5755850..801b499 100644
--- a/tools/pdbgen/enums.pl
+++ b/tools/pdbgen/enums.pl
@@ -696,25 +696,25 @@ package Gimp::CodeGen::enums;
header => 'core/core-enums.h',
symbols => [ qw(GIMP_LAYER_MODE_NORMAL GIMP_LAYER_MODE_DISSOLVE
GIMP_LAYER_MODE_BEHIND
- GIMP_LAYER_MODE_MULTIPLY_BROKEN
- GIMP_LAYER_MODE_SCREEN_BROKEN
- GIMP_LAYER_MODE_OVERLAY_BROKEN
- GIMP_LAYER_MODE_DIFFERENCE_BROKEN
- GIMP_LAYER_MODE_ADDITION_BROKEN
- GIMP_LAYER_MODE_SUBTRACT_BROKEN
- GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN
- GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN
- GIMP_LAYER_MODE_HSV_HUE_BROKEN
- GIMP_LAYER_MODE_HSV_SATURATION_BROKEN
- GIMP_LAYER_MODE_HSV_COLOR_BROKEN
- GIMP_LAYER_MODE_HSV_VALUE_BROKEN
- GIMP_LAYER_MODE_DIVIDE_BROKEN
- GIMP_LAYER_MODE_DODGE_BROKEN
- GIMP_LAYER_MODE_BURN_BROKEN
- GIMP_LAYER_MODE_HARDLIGHT_BROKEN
- GIMP_LAYER_MODE_SOFTLIGHT_BROKEN
- GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN
- GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN
+ GIMP_LAYER_MODE_MULTIPLY_LEGACY
+ GIMP_LAYER_MODE_SCREEN_LEGACY
+ GIMP_LAYER_MODE_OVERLAY_LEGACY
+ GIMP_LAYER_MODE_DIFFERENCE_LEGACY
+ GIMP_LAYER_MODE_ADDITION_LEGACY
+ GIMP_LAYER_MODE_SUBTRACT_LEGACY
+ GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY
+ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY
+ GIMP_LAYER_MODE_HSV_HUE_LEGACY
+ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY
+ GIMP_LAYER_MODE_HSV_COLOR_LEGACY
+ GIMP_LAYER_MODE_HSV_VALUE_LEGACY
+ GIMP_LAYER_MODE_DIVIDE_LEGACY
+ GIMP_LAYER_MODE_DODGE_LEGACY
+ GIMP_LAYER_MODE_BURN_LEGACY
+ GIMP_LAYER_MODE_HARDLIGHT_LEGACY
+ GIMP_LAYER_MODE_SOFTLIGHT_LEGACY
+ GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY
+ GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY
GIMP_LAYER_MODE_COLOR_ERASE
GIMP_LAYER_MODE_OVERLAY GIMP_LAYER_MODE_LCH_HUE
GIMP_LAYER_MODE_LCH_CHROMA
@@ -723,25 +723,25 @@ package Gimp::CodeGen::enums;
mapping => { GIMP_LAYER_MODE_NORMAL => '0',
GIMP_LAYER_MODE_DISSOLVE => '1',
GIMP_LAYER_MODE_BEHIND => '2',
- GIMP_LAYER_MODE_MULTIPLY_BROKEN => '3',
- GIMP_LAYER_MODE_SCREEN_BROKEN => '4',
- GIMP_LAYER_MODE_OVERLAY_BROKEN => '5',
- GIMP_LAYER_MODE_DIFFERENCE_BROKEN => '6',
- GIMP_LAYER_MODE_ADDITION_BROKEN => '7',
- GIMP_LAYER_MODE_SUBTRACT_BROKEN => '8',
- GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN => '9',
- GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN => '10',
- GIMP_LAYER_MODE_HSV_HUE_BROKEN => '11',
- GIMP_LAYER_MODE_HSV_SATURATION_BROKEN => '12',
- GIMP_LAYER_MODE_HSV_COLOR_BROKEN => '13',
- GIMP_LAYER_MODE_HSV_VALUE_BROKEN => '14',
- GIMP_LAYER_MODE_DIVIDE_BROKEN => '15',
- GIMP_LAYER_MODE_DODGE_BROKEN => '16',
- GIMP_LAYER_MODE_BURN_BROKEN => '17',
- GIMP_LAYER_MODE_HARDLIGHT_BROKEN => '18',
- GIMP_LAYER_MODE_SOFTLIGHT_BROKEN => '19',
- GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN => '20',
- GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN => '21',
+ GIMP_LAYER_MODE_MULTIPLY_LEGACY => '3',
+ GIMP_LAYER_MODE_SCREEN_LEGACY => '4',
+ GIMP_LAYER_MODE_OVERLAY_LEGACY => '5',
+ GIMP_LAYER_MODE_DIFFERENCE_LEGACY => '6',
+ GIMP_LAYER_MODE_ADDITION_LEGACY => '7',
+ GIMP_LAYER_MODE_SUBTRACT_LEGACY => '8',
+ GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY => '9',
+ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY => '10',
+ GIMP_LAYER_MODE_HSV_HUE_LEGACY => '11',
+ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY => '12',
+ GIMP_LAYER_MODE_HSV_COLOR_LEGACY => '13',
+ GIMP_LAYER_MODE_HSV_VALUE_LEGACY => '14',
+ GIMP_LAYER_MODE_DIVIDE_LEGACY => '15',
+ GIMP_LAYER_MODE_DODGE_LEGACY => '16',
+ GIMP_LAYER_MODE_BURN_LEGACY => '17',
+ GIMP_LAYER_MODE_HARDLIGHT_LEGACY => '18',
+ GIMP_LAYER_MODE_SOFTLIGHT_LEGACY => '19',
+ GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY => '20',
+ GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY => '21',
GIMP_LAYER_MODE_COLOR_ERASE => '22',
GIMP_LAYER_MODE_OVERLAY => '23',
GIMP_LAYER_MODE_LCH_HUE => '24',
diff --git a/tools/pdbgen/pdb/brush_select.pdb b/tools/pdbgen/pdb/brush_select.pdb
index 79811c6..0f14220 100644
--- a/tools/pdbgen/pdb/brush_select.pdb
+++ b/tools/pdbgen/pdb/brush_select.pdb
@@ -42,8 +42,8 @@ sub brushes_popup {
%invoke = (
code => <<'CODE'
{
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
if (gimp->no_interface ||
! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
@@ -107,8 +107,8 @@ sub brushes_set_popup {
%invoke = (
code => <<'CODE'
{
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
if (gimp->no_interface ||
! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
diff --git a/tools/pdbgen/pdb/brushes.pdb b/tools/pdbgen/pdb/brushes.pdb
index f334864..e3553c4 100644
--- a/tools/pdbgen/pdb/brushes.pdb
+++ b/tools/pdbgen/pdb/brushes.pdb
@@ -173,8 +173,8 @@ sub brushes_get_brush_data {
{
GimpBrush *brush;
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
if (name && strlen (name))
brush = gimp_pdb_get_brush (gimp, name, FALSE, error);
diff --git a/tools/pdbgen/pdb/context.pdb b/tools/pdbgen/pdb/context.pdb
index f2927bc..ac706a9 100644
--- a/tools/pdbgen/pdb/context.pdb
+++ b/tools/pdbgen/pdb/context.pdb
@@ -476,8 +476,8 @@ HELP
%invoke = (
code => <<'CODE'
{
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_context_set_paint_mode (context, paint_mode);
}
diff --git a/tools/pdbgen/pdb/edit.pdb b/tools/pdbgen/pdb/edit.pdb
index 682326c..7e4020d 100644
--- a/tools/pdbgen/pdb/edit.pdb
+++ b/tools/pdbgen/pdb/edit.pdb
@@ -661,8 +661,8 @@ HELP
if (gimp_fill_options_set_by_fill_mode (options, context,
fill_mode, error))
{
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_context_set_opacity (GIMP_CONTEXT (options), opacity / 100.0);
gimp_context_set_paint_mode (GIMP_CONTEXT (options), paint_mode);
@@ -766,8 +766,8 @@ HELP
if (gimp_fill_options_set_by_fill_mode (options, context,
fill_mode, error))
{
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_context_set_opacity (GIMP_CONTEXT (options), opacity / 100.0);
gimp_context_set_paint_mode (GIMP_CONTEXT (options), paint_mode);
@@ -871,8 +871,8 @@ HELP
{
GimpGradient *gradient;
- if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
if (progress)
gimp_progress_start (progress, FALSE, _("Blending"));
diff --git a/tools/pdbgen/pdb/layer.pdb b/tools/pdbgen/pdb/layer.pdb
index a499160..a4d19c0 100644
--- a/tools/pdbgen/pdb/layer.pdb
+++ b/tools/pdbgen/pdb/layer.pdb
@@ -59,8 +59,8 @@ HELP
gboolean has_alpha = FALSE;
const Babl *format;
- if (mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
switch (type)
{
@@ -1189,8 +1189,8 @@ sub layer_set_mode {
%invoke = (
code => <<'CODE'
{
- if (mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
- mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
+ if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+ mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_layer_set_mode (layer, mode, TRUE);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
