archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

addon_utils default mismatch /w enable/disable

Browse Source 
default_set argument is now False for both.
This commit is contained in:
Campbell Barton
2015-06-14 05:12:45 +10:00
parent 75a86d6a8e
commit 1c81bcffde
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/modules/bpy/utils/__init__.py
View File

@@ -161,7 +161,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
# modification time changes. This `won't` work for packages so... # modification time changes. This `won't` work for packages so...
# its not perfect. # its not perfect.
for module_name in [ext.module for ext in _user_preferences.addons]: 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): def register_module_call(mod):
register = getattr(mod, "register", None) register = getattr(mod, "register", None)

6
release/scripts/startup/bl_operators/wm.py
View File

@@ -1788,7 +1788,7 @@ class WM_OT_addon_disable(Operator):
err_str = traceback.format_exc() err_str = traceback.format_exc()
print(err_str) 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: if err_str:
self.report({'ERROR'}, 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. # disable any addons we may have enabled previously and removed.
# this is unlikely but do just in case. bug [#23978] # this is unlikely but do just in case. bug [#23978]
for new_addon in addons_new: 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 # possible the zip contains multiple addons, we could disallow this
# but for now just use the first # but for now just use the first
@@ -2068,7 +2068,7 @@ class WM_OT_addon_remove(Operator):
return {'CANCELLED'} return {'CANCELLED'}
# in case its enabled # in case its enabled
addon_utils.disable(self.module) addon_utils.disable(self.module, default_set=True)
import shutil import shutil
if isdir: if isdir:

4
tests/python/bl_load_addons.py
View File

@@ -65,7 +65,7 @@ def disable_addons():
# first disable all # first disable all
addons = bpy.context.user_preferences.addons addons = bpy.context.user_preferences.addons
for mod_name in list(addons.keys()): 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) assert(bool(addons) is False)
@@ -111,7 +111,7 @@ def reload_addons(do_reload=True, do_reverse=True):
for mod in modules: for mod in modules:
mod_name = mod.__name__ mod_name = mod.__name__
print("\tdisabling:", 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)) assert(not (mod_name in addons))
# now test reloading # now test reloading

2
tests/python/bl_load_py_modules.py
View File

@@ -68,7 +68,7 @@ def load_addons():
# first disable all # first disable all
for mod_name in list(addons.keys()): 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) assert(bool(addons) is False)