diff options
| -rw-r--r-- | release/scripts/modules/bpy/utils/__init__.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 6 | ||||
| -rw-r--r-- | tests/python/bl_load_addons.py | 4 | ||||
| -rw-r--r-- | tests/python/bl_load_py_modules.py | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py index 348deb2c063..7a1224db226 100644 --- a/release/scripts/modules/bpy/utils/__init__.py +++ b/release/scripts/modules/bpy/utils/__init__.py @@ -161,7 +161,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False): # modification time changes. This `won't` work for packages so... # its not perfect. for module_name in [ext.module for ext in _user_preferences.addons]: - _addon_utils.disable(module_name, default_set=False) + _addon_utils.disable(module_name) def register_module_call(mod): register = getattr(mod, "register", None) diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index ebb859f7fa1..edf60aa40e7 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1788,7 +1788,7 @@ class WM_OT_addon_disable(Operator): err_str = traceback.format_exc() print(err_str) - addon_utils.disable(self.module, handle_error=err_cb) + addon_utils.disable(self.module, default_set=True, handle_error=err_cb) if err_str: self.report({'ERROR'}, err_str) @@ -2004,7 +2004,7 @@ class WM_OT_addon_install(Operator): # disable any addons we may have enabled previously and removed. # this is unlikely but do just in case. bug [#23978] for new_addon in addons_new: - addon_utils.disable(new_addon) + addon_utils.disable(new_addon, default_set=True) # possible the zip contains multiple addons, we could disallow this # but for now just use the first @@ -2068,7 +2068,7 @@ class WM_OT_addon_remove(Operator): return {'CANCELLED'} # in case its enabled - addon_utils.disable(self.module) + addon_utils.disable(self.module, default_set=True) import shutil if isdir: diff --git a/tests/python/bl_load_addons.py b/tests/python/bl_load_addons.py index 6bb0eaecd3d..29304400005 100644 --- a/tests/python/bl_load_addons.py +++ b/tests/python/bl_load_addons.py @@ -65,7 +65,7 @@ def disable_addons(): # first disable all addons = bpy.context.user_preferences.addons for mod_name in list(addons.keys()): - addon_utils.disable(mod_name) + addon_utils.disable(mod_name, default_set=True) assert(bool(addons) is False) @@ -111,7 +111,7 @@ def reload_addons(do_reload=True, do_reverse=True): for mod in modules: mod_name = mod.__name__ print("\tdisabling:", mod_name) - addon_utils.disable(mod_name) + addon_utils.disable(mod_name, default_set=True) assert(not (mod_name in addons)) # now test reloading diff --git a/tests/python/bl_load_py_modules.py b/tests/python/bl_load_py_modules.py index 07905dfa4b4..d4285155000 100644 --- a/tests/python/bl_load_py_modules.py +++ b/tests/python/bl_load_py_modules.py @@ -68,7 +68,7 @@ def load_addons(): # first disable all for mod_name in list(addons.keys()): - addon_utils.disable(mod_name) + addon_utils.disable(mod_name, default_set=True) assert(bool(addons) is False) |