From f8108d6dfd6d0b8c4e3fccfd8abce421d8836697 Mon Sep 17 00:00:00 2001 From: zanqdo Date: Tue, 11 Apr 2023 21:32:29 +0200 Subject: [PATCH] UI: Rename Bright/Contrast to Brightness/Contrast Rename *Bright/Contrast* to *Brightness/Contrast* in order to avoid the use of shortened names and improve consistency within Blender and with industry conventions. Reasoning: The modified color characteristic is called *brightness*, not *bright*. You don't modify the *bright* of an image. This also interferes with search in case someone searches for brightness, producing no results. *Note: This patch should only touch UI names which do not need versioning. It leaves the actual property name in nodes for a future breaking release.* Pull Request: https://projects.blender.org/blender/blender/pulls/104998 --- scripts/startup/bl_ui/space_view3d.py | 4 ++-- source/blender/makesrna/intern/rna_sequencer.c | 2 +- source/blender/nodes/NOD_static_types.h | 4 ++-- .../nodes/composite/nodes/node_composite_brightness.cc | 4 ++-- source/blender/nodes/shader/nodes/node_shader_brightness.cc | 2 +- source/blender/sequencer/intern/modifier.c | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index e55490282e0..5815d8bba47 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -1962,7 +1962,7 @@ class VIEW3D_MT_paint_gpencil(Menu): layout.operator("gpencil.vertex_color_invert", text="Invert") layout.operator("gpencil.vertex_color_levels", text="Levels") layout.operator("gpencil.vertex_color_hsv", text="Hue Saturation Value") - layout.operator("gpencil.vertex_color_brightness_contrast", text="Bright/Contrast") + layout.operator("gpencil.vertex_color_brightness_contrast", text="Brightness/Contrast") class VIEW3D_MT_select_gpencil(Menu): @@ -3060,7 +3060,7 @@ class VIEW3D_MT_paint_vertex(Menu): layout.operator("paint.vertex_color_invert", text="Invert") layout.operator("paint.vertex_color_levels", text="Levels") layout.operator("paint.vertex_color_hsv", text="Hue Saturation Value") - layout.operator("paint.vertex_color_brightness_contrast", text="Bright/Contrast") + layout.operator("paint.vertex_color_brightness_contrast", text="Brightness/Contrast") class VIEW3D_MT_hook(Menu): diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index d6e9a3a4f81..1cad3b2bb75 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -62,7 +62,7 @@ typedef struct EffectInfo { } EffectInfo; const EnumPropertyItem rna_enum_sequence_modifier_type_items[] = { - {seqModifierType_BrightContrast, "BRIGHT_CONTRAST", ICON_NONE, "Bright/Contrast", ""}, + {seqModifierType_BrightContrast, "BRIGHT_CONTRAST", ICON_NONE, "Brightness/Contrast", ""}, {seqModifierType_ColorBalance, "COLOR_BALANCE", ICON_NONE, "Color Balance", ""}, {seqModifierType_Curves, "CURVES", ICON_NONE, "Curves", ""}, {seqModifierType_HueCorrect, "HUE_CORRECT", ICON_NONE, "Hue Correct", ""}, diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index bbd44be2f61..c61d7606cae 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -31,7 +31,7 @@ DefNode(ShaderNode, SH_NODE_RGBTOBW, 0, "RGBTOB DefNode(ShaderNode, SH_NODE_SHADERTORGB, 0, "SHADERTORGB", ShaderToRGB, "Shader to RGB", "Convert rendering effect (such as light and shadow) to color. Typically used for non-photorealistic rendering, to apply additional effects on the output of BSDFs.\nNote: only supported for Eevee") DefNode(ShaderNode, SH_NODE_NORMAL, 0, "NORMAL", Normal, "Normal", "Generate a normal vector and a dot product") DefNode(ShaderNode, SH_NODE_GAMMA, 0, "GAMMA", Gamma, "Gamma", "Apply a gamma correction") -DefNode(ShaderNode, SH_NODE_BRIGHTCONTRAST, 0, "BRIGHTCONTRAST", BrightContrast, "Bright Contrast", "Control the brightness and contrast of the input color") +DefNode(ShaderNode, SH_NODE_BRIGHTCONTRAST, 0, "BRIGHTCONTRAST", BrightContrast, "Brightness/Contrast","Control the brightness and contrast of the input color") DefNode(ShaderNode, SH_NODE_MAPPING, def_sh_mapping, "MAPPING", Mapping, "Mapping", "Transform the input vector by applying translation, rotation, and scale") DefNode(ShaderNode, SH_NODE_CURVE_VEC, def_vector_curve, "CURVE_VEC", VectorCurve, "Vector Curves", "Map an input vectors to curves, used to fine-tune the interpolation of the input") DefNode(ShaderNode, SH_NODE_CURVE_RGB, def_rgb_curve, "CURVE_RGB", RGBCurve, "RGB Curves", "Apply color corrections for each color channel") @@ -176,7 +176,7 @@ DefNode(CompositorNode, CMP_NODE_DISPLACE, 0, "DISPLA DefNode(CompositorNode, CMP_NODE_COMBHSVA_LEGACY,0, "COMBHSVA", CombHSVA, "Combine HSVA", "" ) DefNode(CompositorNode, CMP_NODE_MATH, def_math, "MATH", Math, "Math", "" ) DefNode(CompositorNode, CMP_NODE_LUMA_MATTE, def_cmp_luma_matte, "LUMA_MATTE", LumaMatte, "Luminance Key", "" ) -DefNode(CompositorNode, CMP_NODE_BRIGHTCONTRAST, def_cmp_brightcontrast, "BRIGHTCONTRAST", BrightContrast, "Bright/Contrast", "" ) +DefNode(CompositorNode, CMP_NODE_BRIGHTCONTRAST, def_cmp_brightcontrast, "BRIGHTCONTRAST", BrightContrast, "Brightness/Contrast","" ) DefNode(CompositorNode, CMP_NODE_GAMMA, 0, "GAMMA", Gamma, "Gamma", "" ) DefNode(CompositorNode, CMP_NODE_INVERT, def_cmp_invert, "INVERT", Invert, "Invert", "" ) DefNode(CompositorNode, CMP_NODE_NORMALIZE, 0, "NORMALIZE", Normalize, "Normalize", "" ) diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.cc b/source/blender/nodes/composite/nodes/node_composite_brightness.cc index 4c1de27e6ed..d8dffcc71ee 100644 --- a/source/blender/nodes/composite/nodes/node_composite_brightness.cc +++ b/source/blender/nodes/composite/nodes/node_composite_brightness.cc @@ -14,7 +14,7 @@ #include "node_composite_util.hh" -/* **************** Bright and Contrast ******************** */ +/* **************** Brightness and Contrast ******************** */ namespace blender::nodes::node_composite_brightness_cc { @@ -78,7 +78,7 @@ void register_node_type_cmp_brightcontrast() static bNodeType ntype; - cmp_node_type_base(&ntype, CMP_NODE_BRIGHTCONTRAST, "Bright/Contrast", NODE_CLASS_OP_COLOR); + cmp_node_type_base(&ntype, CMP_NODE_BRIGHTCONTRAST, "Brightness/Contrast", NODE_CLASS_OP_COLOR); ntype.declare = file_ns::cmp_node_brightcontrast_declare; ntype.draw_buttons = file_ns::node_composit_buts_brightcontrast; ntype.initfunc = file_ns::node_composit_init_brightcontrast; diff --git a/source/blender/nodes/shader/nodes/node_shader_brightness.cc b/source/blender/nodes/shader/nodes/node_shader_brightness.cc index 2c98bd7b291..d9410e028cc 100644 --- a/source/blender/nodes/shader/nodes/node_shader_brightness.cc +++ b/source/blender/nodes/shader/nodes/node_shader_brightness.cc @@ -30,7 +30,7 @@ void register_node_type_sh_brightcontrast() static bNodeType ntype; - sh_node_type_base(&ntype, SH_NODE_BRIGHTCONTRAST, "Bright/Contrast", NODE_CLASS_OP_COLOR); + sh_node_type_base(&ntype, SH_NODE_BRIGHTCONTRAST, "Brightness/Contrast", NODE_CLASS_OP_COLOR); ntype.declare = file_ns::node_declare; ntype.gpu_fn = file_ns::gpu_shader_brightcontrast; diff --git a/source/blender/sequencer/intern/modifier.c b/source/blender/sequencer/intern/modifier.c index f645b7732a4..06e2b276533 100644 --- a/source/blender/sequencer/intern/modifier.c +++ b/source/blender/sequencer/intern/modifier.c @@ -976,7 +976,7 @@ static SequenceModifierTypeInfo seqModifier_HueCorrect = { /** \} */ /* -------------------------------------------------------------------- */ -/** \name Bright/Contrast Modifier +/** \name Brightness/Contrast Modifier * \{ */ typedef struct BrightContrastThreadData { @@ -1071,7 +1071,7 @@ static void brightcontrast_apply(struct SequenceModifierData *smd, ImBuf *ibuf, } static SequenceModifierTypeInfo seqModifier_BrightContrast = { - /*name*/ CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Bright/Contrast"), + /*name*/ CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Brightness/Contrast"), /*struct_name*/ "BrightContrastModifierData", /*struct_size*/ sizeof(BrightContrastModifierData), /*init_data*/ NULL,