blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Cleanup: Use ampersand instead of "and" for labels 

UI guideline is use '&' for labels, use "and" for descriptions.
This commit is contained in:
Aaron Carlisle 2023-01-09 00:19:26 -05:00
parent 68625431d5
commit 25864d3dfc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/intern/draw_color_management.cc
View File

@ -62,7 +62,7 @@ static eDRWColorManagementType drw_color_management_type_for_space_image(const S
{
Image *image = sima.image;
/* Use inverse logic as there isn't a setting for `Color And Alpha`. */
/* Use inverse logic as there isn't a setting for `Color & Alpha`. */
const eSpaceImage_Flag display_channels_mode = static_cast<eSpaceImage_Flag>(sima.flag);
const bool display_color_channel = (display_channels_mode & (SI_SHOW_ALPHA | SI_SHOW_ZBUF)) == 0;

6
source/blender/makesrna/intern/rna_space.c
View File

@ -371,7 +371,7 @@ static const EnumPropertyItem display_channels_items[] = {
{SI_USE_ALPHA,
"COLOR_ALPHA",
ICON_IMAGE_RGB_ALPHA,
"Color and Alpha",
"Color & Alpha",
"Display image with RGB colors and alpha transparency"},
{0, "COLOR", ICON_IMAGE_RGB, "Color", "Display image with RGB colors"},
{SI_SHOW_ALPHA, "ALPHA", ICON_IMAGE_ALPHA, "Alpha", "Display alpha transparency channel"},
@ -5773,7 +5773,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna)
{SEQ_USE_ALPHA,
"COLOR_ALPHA",
ICON_IMAGE_RGB_ALPHA,
"Color and Alpha",
"Color & Alpha",
"Display image with RGB colors and alpha transparency"},
{0, "COLOR", ICON_IMAGE_RGB, "Color", "Display image with RGB colors"},
{0, NULL, 0, NULL, NULL},
@ -7363,7 +7363,7 @@ static void rna_def_space_node(BlenderRNA *brna)
{SNODE_USE_ALPHA,
"COLOR_ALPHA",
ICON_IMAGE_RGB_ALPHA,
"Color and Alpha",
"Color & Alpha",
"Display image with RGB colors and alpha transparency"},
{0, "COLOR", ICON_IMAGE_RGB, "Color", "Display image with RGB colors"},
{SNODE_SHOW_ALPHA, "ALPHA", ICON_IMAGE_ALPHA, "Alpha", "Display alpha transparency channel"},