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

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-06-19 16:01:53 +10:00
parent d70bd00422 6eb2b5f47b
commit df78d23f93
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/addons_core/bl_pkg/bl_extension_ui.py
View File

@@ -576,8 +576,8 @@ def extensions_panel_draw_impl(
remote_ex = ex
def error_fn_local(ex):
nonlocal remote_ex
remote_ex = ex
nonlocal local_ex
local_ex = ex
for repo_index, (
pkg_manifest_remote,

8
scripts/startup/bl_ui/space_userpref.py
View File

@@ -2467,8 +2467,6 @@ class USERPREF_PT_addons(AddOnPanel, Panel):
colsub = box.column()
row = colsub.row(align=True)
is_extension = addon_utils.check_extension(addon_module_name)
row.operator(
"preferences.addon_expand",
icon='DISCLOSURE_TRI_DOWN' if bl_info["show_expanded"] else 'DISCLOSURE_TRI_RIGHT',
@@ -2512,11 +2510,7 @@ class USERPREF_PT_addons(AddOnPanel, Panel):
if value := bl_info["version"]:
split = colsub.row().split(factor=0.15)
split.label(text="Version:")
# Extensions use SEMVER.
if is_extension:
split.label(text=value, translate=False)
else:
split.label(text=".".join(str(x) for x in value), translate=False)
split.label(text=".".join(str(x) for x in value), translate=False)
if value := bl_info["warning"]:
split = colsub.row().split(factor=0.15)
split.label(text="Warning:")