ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'blender-v5.2-release'

Browse source
This commit is contained in:
Bastien Montagne 2026-07-01 11:08:44 +02:00
commit 1d2c1ff0bc
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/modules/_bl_i18n_utils/bl_extract_messages.py
View file

@ -1022,6 +1022,14 @@ def dump_ocio_config(msgs, reports, settings):
msgs, settings.DEFAULT_CONTEXT, description, msgsrc,
reports, None, settings,
)
family = colorspace.getFamily()
family_separator = config.getFamilySeparator()
for family_part in family.split(family_separator):
msgsrc = "Colorspace family from OCIO config"
process_msg(
msgs, settings.DEFAULT_CONTEXT, family_part, msgsrc,
reports, None, settings,
)
def dump_asset_messages(msgs, reports, settings):

8
source/blender/editors/interface/interface_ops_color.cc
View file

@ -172,7 +172,7 @@ static void colorspaces_menu_draw(const bContext *C, Menu *menu)
for (const StringRef &dir : subdirs) {
std::string path = root + std::string(dir);
col.context_string_set("colorspace_parent_path", path);
col.menu(COLORSPACE_MENU_ID, dir, ICON_NONE);
col.menu(COLORSPACE_MENU_ID, IFACE_(dir), ICON_NONE);
}
if (!subdirs.is_empty() && !colorspaces_at_this_level.is_empty()) {
@ -183,9 +183,9 @@ static void colorspaces_menu_draw(const bContext *C, Menu *menu)
colorspaces_menu_add_button(col,
ptr,
prop,
IMB_colormanagement_colorspace_get_name(cs),
IMB_colormanagement_colorspace_get_name(cs),
IMB_colormanagement_colorspace_get_description(cs));
IFACE_(IMB_colormanagement_colorspace_get_name(cs)),
IFACE_(IMB_colormanagement_colorspace_get_name(cs)),
TIP_(IMB_colormanagement_colorspace_get_description(cs)));
}
if (!parent_path) {