UI: use consistent names and menu organization for blending modes
The Python API is unchanged and remains compatible. Differential Revision: https://developer.blender.org/D5830
This commit is contained in:
parent
02877bdf39
commit
97ba7f3c32
|
@ -1452,81 +1452,77 @@ static void rna_def_brush(BlenderRNA *brna)
|
|||
PropertyRNA *prop;
|
||||
|
||||
static const EnumPropertyItem prop_blend_items[] = {
|
||||
{IMB_BLEND_MIX, "MIX", 0, "Mix", "Use mix blending mode while painting"},
|
||||
{IMB_BLEND_MIX, "MIX", 0, "Mix", "Use Mix blending mode while painting"},
|
||||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{IMB_BLEND_DARKEN, "DARKEN", 0, "Darken", "Use darken blending mode while painting"},
|
||||
{IMB_BLEND_MUL, "MUL", 0, "Multiply", "Use multiply blending mode while painting"},
|
||||
{IMB_BLEND_DARKEN, "DARKEN", 0, "Darken", "Use Darken blending mode while painting"},
|
||||
{IMB_BLEND_MUL, "MUL", 0, "Multiply", "Use Multiply blending mode while painting"},
|
||||
{IMB_BLEND_COLORBURN,
|
||||
"COLORBURN",
|
||||
0,
|
||||
"Color burn",
|
||||
"Use color burn blending mode while painting"},
|
||||
"Color Burn",
|
||||
"Use Color Burn blending mode while painting"},
|
||||
{IMB_BLEND_LINEARBURN,
|
||||
"LINEARBURN",
|
||||
0,
|
||||
"Linear burn",
|
||||
"Use linear burn blending mode while painting"},
|
||||
"Linear Burn",
|
||||
"Use Linear Burn blending mode while painting"},
|
||||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{IMB_BLEND_LIGHTEN, "LIGHTEN", 0, "Lighten", "Use lighten blending mode while painting"},
|
||||
{IMB_BLEND_SCREEN, "SCREEN", 0, "Screen", "Use screen blending mode while painting"},
|
||||
{IMB_BLEND_LIGHTEN, "LIGHTEN", 0, "Lighten", "Use Lighten blending mode while painting"},
|
||||
{IMB_BLEND_SCREEN, "SCREEN", 0, "Screen", "Use Screen blending mode while painting"},
|
||||
{IMB_BLEND_COLORDODGE,
|
||||
"COLORDODGE",
|
||||
0,
|
||||
"Color dodge",
|
||||
"Use color dodge blending mode while painting"},
|
||||
{IMB_BLEND_ADD, "ADD", 0, "Add", "Use add blending mode while painting"},
|
||||
"Color Dodge",
|
||||
"Use Color Dodge blending mode while painting"},
|
||||
{IMB_BLEND_ADD, "ADD", 0, "Add", "Use Add blending mode while painting"},
|
||||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{IMB_BLEND_OVERLAY, "OVERLAY", 0, "Overlay", "Use overlay blending mode while painting"},
|
||||
{IMB_BLEND_OVERLAY, "OVERLAY", 0, "Overlay", "Use Overlay blending mode while painting"},
|
||||
{IMB_BLEND_SOFTLIGHT,
|
||||
"SOFTLIGHT",
|
||||
0,
|
||||
"Soft light",
|
||||
"Use softlight blending mode while painting"},
|
||||
"Soft Light",
|
||||
"Use Soft Light blending mode while painting"},
|
||||
{IMB_BLEND_HARDLIGHT,
|
||||
"HARDLIGHT",
|
||||
0,
|
||||
"Hard light",
|
||||
"Use hard light blending mode while painting"},
|
||||
"Hard Light",
|
||||
"Use Hard Light blending mode while painting"},
|
||||
{IMB_BLEND_VIVIDLIGHT,
|
||||
"VIVIDLIGHT",
|
||||
0,
|
||||
"Vivid light",
|
||||
"Use vividlight blending mode while painting"},
|
||||
"Vivid Light",
|
||||
"Use Vivid Light blending mode while painting"},
|
||||
{IMB_BLEND_LINEARLIGHT,
|
||||
"LINEARLIGHT",
|
||||
0,
|
||||
"Linear light",
|
||||
"Use linearlight blending mode while painting"},
|
||||
"Linear Light",
|
||||
"Use Linear Light blending mode while painting"},
|
||||
{IMB_BLEND_PINLIGHT,
|
||||
"PINLIGHT",
|
||||
0,
|
||||
"Pin light",
|
||||
"Use pinlight blending mode while painting"},
|
||||
"Pin Light",
|
||||
"Use Pin Light blending mode while painting"},
|
||||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{IMB_BLEND_DIFFERENCE,
|
||||
"DIFFERENCE",
|
||||
0,
|
||||
"Difference",
|
||||
"Use difference blending mode while painting"},
|
||||
"Use Difference blending mode while painting"},
|
||||
{IMB_BLEND_EXCLUSION,
|
||||
"EXCLUSION",
|
||||
0,
|
||||
"Exclusion",
|
||||
"Use exclusion blending mode while painting"},
|
||||
{IMB_BLEND_SUB, "SUB", 0, "Subtract", "Use subtract blending mode while painting"},
|
||||
"Use Exclusion blending mode while painting"},
|
||||
{IMB_BLEND_SUB, "SUB", 0, "Subtract", "Use Subtract blending mode while painting"},
|
||||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{IMB_BLEND_HUE, "HUE", 0, "Hue", "Use hue blending mode while painting"},
|
||||
{IMB_BLEND_HUE, "HUE", 0, "Hue", "Use Hue blending mode while painting"},
|
||||
{IMB_BLEND_SATURATION,
|
||||
"SATURATION",
|
||||
0,
|
||||
"Saturation",
|
||||
"Use saturation blending mode while painting"},
|
||||
{IMB_BLEND_COLOR, "COLOR", 0, "Color", "Use color blending mode while painting"},
|
||||
{IMB_BLEND_LUMINOSITY,
|
||||
"LUMINOSITY",
|
||||
0,
|
||||
"Luminosity",
|
||||
"Use luminosity blending mode while painting"},
|
||||
"Use Saturation blending mode while painting"},
|
||||
{IMB_BLEND_COLOR, "COLOR", 0, "Color", "Use Color blending mode while painting"},
|
||||
{IMB_BLEND_LUMINOSITY, "LUMINOSITY", 0, "Value", "Use Value blending mode while painting"},
|
||||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{IMB_BLEND_ERASE_ALPHA, "ERASE_ALPHA", 0, "Erase Alpha", "Erase alpha while painting"},
|
||||
{IMB_BLEND_ADD_ALPHA, "ADD_ALPHA", 0, "Add Alpha", "Add alpha while painting"},
|
||||
|
@ -2415,7 +2411,7 @@ static void rna_def_operator_stroke_element(BlenderRNA *brna)
|
|||
prop = RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_flag(prop, PROP_IDPROPERTY);
|
||||
RNA_def_property_range(prop, 0.0f, FLT_MAX);
|
||||
RNA_def_property_ui_text(prop, "Brush Size", "Brush Size in screen space");
|
||||
RNA_def_property_ui_text(prop, "Brush Size", "Brush size in screen space");
|
||||
|
||||
prop = RNA_def_property(srna, "pen_flip", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_flag(prop, PROP_IDPROPERTY);
|
||||
|
|
|
@ -41,7 +41,7 @@ const EnumPropertyItem rna_enum_ramp_blend_items[] = {
|
|||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{MA_RAMP_LIGHT, "LIGHTEN", 0, "Lighten", ""},
|
||||
{MA_RAMP_SCREEN, "SCREEN", 0, "Screen", ""},
|
||||
{MA_RAMP_DODGE, "DODGE", 0, "Dodge", ""},
|
||||
{MA_RAMP_DODGE, "DODGE", 0, "Color Dodge", ""},
|
||||
{MA_RAMP_ADD, "ADD", 0, "Add", ""},
|
||||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{MA_RAMP_OVERLAY, "OVERLAY", 0, "Overlay", ""},
|
||||
|
|
|
@ -3986,7 +3986,7 @@ static void def_mix_rgb(StructRNA *srna)
|
|||
prop = RNA_def_property(srna, "blend_type", PROP_ENUM, PROP_NONE);
|
||||
RNA_def_property_enum_sdna(prop, NULL, "custom1");
|
||||
RNA_def_property_enum_items(prop, rna_enum_ramp_blend_items);
|
||||
RNA_def_property_ui_text(prop, "Blend Type", "");
|
||||
RNA_def_property_ui_text(prop, "Blending Mode", "");
|
||||
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
|
||||
|
||||
prop = RNA_def_property(srna, "use_alpha", PROP_BOOLEAN, PROP_NONE);
|
||||
|
|
|
@ -1462,7 +1462,7 @@ static const EnumPropertyItem blend_mode_items[] = {
|
|||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{SEQ_TYPE_LIGHTEN, "LIGHTEN", 0, "Lighten", ""},
|
||||
{SEQ_TYPE_SCREEN, "SCREEN", 0, "Screen", ""},
|
||||
{SEQ_TYPE_DODGE, "DODGE", 0, "Dodge", ""},
|
||||
{SEQ_TYPE_DODGE, "DODGE", 0, "Color Dodge", ""},
|
||||
{SEQ_TYPE_ADD, "ADD", 0, "Add", ""},
|
||||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{SEQ_TYPE_OVERLAY, "OVERLAY", 0, "Overlay", ""},
|
||||
|
@ -1723,7 +1723,7 @@ static void rna_def_sequence(BlenderRNA *brna)
|
|||
RNA_def_property_enum_sdna(prop, NULL, "blend_mode");
|
||||
RNA_def_property_enum_items(prop, blend_mode_items);
|
||||
RNA_def_property_ui_text(
|
||||
prop, "Blend Mode", "Method for controlling how the strip combines with other strips");
|
||||
prop, "Blending Mode", "Method for controlling how the strip combines with other strips");
|
||||
RNA_def_property_update(
|
||||
prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update");
|
||||
|
||||
|
@ -2785,27 +2785,31 @@ static void rna_def_text(StructRNA *srna)
|
|||
static void rna_def_color_mix(StructRNA *srna)
|
||||
{
|
||||
static EnumPropertyItem blend_color_items[] = {
|
||||
{SEQ_TYPE_ADD, "ADD", 0, "Add", ""},
|
||||
{SEQ_TYPE_SUB, "SUBTRACT", 0, "Subtract", ""},
|
||||
{SEQ_TYPE_MUL, "MULTIPLY", 0, "Multiply", ""},
|
||||
{SEQ_TYPE_LIGHTEN, "LIGHTEN", 0, "Lighten", ""},
|
||||
{SEQ_TYPE_DARKEN, "DARKEN", 0, "Darken", ""},
|
||||
{SEQ_TYPE_SCREEN, "SCREEN", 0, "Screen", ""},
|
||||
{SEQ_TYPE_OVERLAY, "OVERLAY", 0, "Overlay", ""},
|
||||
{SEQ_TYPE_DODGE, "DODGE", 0, "Dodge", ""},
|
||||
{SEQ_TYPE_MUL, "MULTIPLY", 0, "Multiply", ""},
|
||||
{SEQ_TYPE_COLOR_BURN, "BURN", 0, "Color Burn", ""},
|
||||
{SEQ_TYPE_LINEAR_BURN, "LINEAR_BURN", 0, "Linear Burn", ""},
|
||||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{SEQ_TYPE_LIGHTEN, "LIGHTEN", 0, "Lighten", ""},
|
||||
{SEQ_TYPE_SCREEN, "SCREEN", 0, "Screen", ""},
|
||||
{SEQ_TYPE_DODGE, "DODGE", 0, "Color Dodge", ""},
|
||||
{SEQ_TYPE_ADD, "ADD", 0, "Add", ""},
|
||||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{SEQ_TYPE_OVERLAY, "OVERLAY", 0, "Overlay", ""},
|
||||
{SEQ_TYPE_SOFT_LIGHT, "SOFT_LIGHT", 0, "Soft Light", ""},
|
||||
{SEQ_TYPE_HARD_LIGHT, "HARD_LIGHT", 0, "Hard Light", ""},
|
||||
{SEQ_TYPE_PIN_LIGHT, "PIN_LIGHT", 0, "Pin Light", ""},
|
||||
{SEQ_TYPE_LIN_LIGHT, "LINEAR_LIGHT", 0, "Linear Light", ""},
|
||||
{SEQ_TYPE_VIVID_LIGHT, "VIVID_LIGHT", 0, "Vivid Light", ""},
|
||||
{SEQ_TYPE_BLEND_COLOR, "COLOR", 0, "Color", ""},
|
||||
{SEQ_TYPE_HUE, "HUE", 0, "Hue", ""},
|
||||
{SEQ_TYPE_SATURATION, "SATURATION", 0, "Saturation", ""},
|
||||
{SEQ_TYPE_VALUE, "VALUE", 0, "Value", ""},
|
||||
{SEQ_TYPE_LIN_LIGHT, "LINEAR_LIGHT", 0, "Linear Light", ""},
|
||||
{SEQ_TYPE_PIN_LIGHT, "PIN_LIGHT", 0, "Pin Light", ""},
|
||||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{SEQ_TYPE_DIFFERENCE, "DIFFERENCE", 0, "Difference", ""},
|
||||
{SEQ_TYPE_EXCLUSION, "EXCLUSION", 0, "Exclusion", ""},
|
||||
{SEQ_TYPE_SUB, "SUBTRACT", 0, "Subtract", ""},
|
||||
{0, "", ICON_NONE, NULL, NULL},
|
||||
{SEQ_TYPE_HUE, "HUE", 0, "Hue", ""},
|
||||
{SEQ_TYPE_SATURATION, "SATURATION", 0, "Saturation", ""},
|
||||
{SEQ_TYPE_BLEND_COLOR, "COLOR", 0, "Color", ""},
|
||||
{SEQ_TYPE_VALUE, "VALUE", 0, "Value", ""},
|
||||
{0, NULL, 0, NULL, NULL},
|
||||
};
|
||||
|
||||
|
@ -2817,7 +2821,7 @@ static void rna_def_color_mix(StructRNA *srna)
|
|||
RNA_def_property_enum_sdna(prop, NULL, "blend_effect");
|
||||
RNA_def_property_enum_items(prop, blend_color_items);
|
||||
RNA_def_property_ui_text(
|
||||
prop, "Blend Effect", "Method for controlling how the strip combines with other strips");
|
||||
prop, "Blending Mode", "Method for controlling how the strip combines with other strips");
|
||||
RNA_def_property_update(
|
||||
prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update");
|
||||
|
||||
|
|
Loading…
Reference in New Issue