griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Bastien Montagne
2025-07-07 15:53:53 +02:00
parent 090d3ea994 22e8980b01
commit a345b83f1a
68 changed files with 4509 additions and 2173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/modules/bl_i18n_utils/settings.py
View File

@@ -266,6 +266,10 @@ PYGETTEXT_KEYWORDS = (() +
tuple(("{}\\((?:[^\"',]+,){{2}}\\s*" + _msg_re + r"\s*(?:\)|,)").format(it)
for it in ("BKE_modifier_set_error",)) +
# Window manager job names.
tuple(("{}\\((?:[^\"',]+,){{3}}\\s*" + _msg_re + r"\s*,").format(it)
for it in ("WM_jobs_get",)) +
# Compositor and EEVEE messages.
# Ends either with `)` (function call close), or `,` when there are extra formatting parameters.
tuple((r"{}\(\s*" + _msg_re + r"\s*(?:\)|,)").format(it)
@@ -289,24 +293,20 @@ PYGETTEXT_KEYWORDS = (() +
tuple((r"\.{}\(\s*" + _msg_re + r"\s*\)").format(it)
for it in ("description", "error_message_add")) +
# Node socket labels from declarations: context-less names
# Node socket panels and labels from declarations: context-less names
tuple((r"\.{}\(\s*" + _msg_re +
r"\s*\)(?![^;]*\.translation_context\()[^;]*;").format(it)
for it in ("short_label",)) +
for it in ("short_label", "add_panel",)) +
# Node socket labels from declarations: names with contexts
# Node socket panels and labels from declarations: names with contexts
tuple((r"\.{}\(\s*" + _msg_re + r"[^;]*\.translation_context\(\s*" +
_ctxt_re + r"\s*\)").format(it)
for it in ("short_label",)) +
for it in ("short_label", "add_panel",)) +
# Dynamic node socket labels
tuple((r"{}\(\s*[^,]+,\s*" + _msg_re + r"\s*\)").format(it)
for it in ("node_sock_label",)) +
# Node panel declarations
tuple((r"\.{}\(\s*" + _msg_re + r"\s*\)").format(it)
for it in ("add_panel",)) +
# Geometry Nodes field inputs
((r"FieldInput\(CPPType::get<.*?>\(\),\s*" + _msg_re + r"\s*\)"),) +

6
scripts/modules/bpy_extras/io_utils.py
View File

@@ -437,14 +437,14 @@ path_reference_mode = EnumProperty(
items=(
('AUTO', "Auto", "Use relative paths with subdirectories only"),
('ABSOLUTE', "Absolute", "Always write absolute paths"),
('RELATIVE', "Relative", "Always write relative paths "
"(where possible)"),
('RELATIVE', "Relative", "Write relative paths where possible"),
('MATCH', "Match", "Match absolute/relative "
"setting with input path"),
('STRIP', "Strip Path", "Filename only"),
('STRIP', "Strip", "Filename only"),
('COPY', "Copy", "Copy the file to the destination path "
"(or subdirectory)"),
),
translation_context=i18n_contexts.editor_filebrowser,
default='AUTO',
)