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

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-11-09 11:46:44 +11:00
parent 263212c4fa cd07e729a2
commit 9ee8e00fbc
4 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/startup/bl_operators/userpref.py
View File

@@ -484,9 +484,6 @@ class PREFERENCES_OT_addon_enable(Operator):
# Ensure any wheels are setup before enabling.
module_name = self.module
is_extension = addon_utils.check_extension(module_name)
if is_extension:
addon_utils.extensions_refresh(ensure_wheels=True, addon_modules_pending=[module_name])
mod = addon_utils.enable(module_name, default_set=True, handle_error=err_cb)
@@ -511,10 +508,6 @@ class PREFERENCES_OT_addon_enable(Operator):
if err_str:
self.report({'ERROR'}, err_str)
if is_extension:
# Since the add-on didn't work, remove any wheels it may have installed.
addon_utils.extensions_refresh(ensure_wheels=True)
result = {'CANCELLED'}
if cursor_set:
@@ -552,8 +545,6 @@ class PREFERENCES_OT_addon_disable(Operator):
module_name = self.module
is_extension = addon_utils.check_extension(module_name)
addon_utils.disable(module_name, default_set=True, handle_error=err_cb)
if is_extension:
addon_utils.extensions_refresh(ensure_wheels=True)
if err_str:
self.report({'ERROR'}, err_str)