diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-06-13 22:12:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-06-13 22:14:43 +0300 |
| commit | 1c81bcffde7a2533a9e8e8bc05c9ef7f24588309 (patch) | |
| tree | 918363f9a9da19e1ae55111d3b1c9281437682d0 /release/scripts | |
| parent | 75a86d6a8e48c988294303a2390a0c7b86cca417 (diff) | |
addon_utils default mismatch /w enable/disable
default_set argument is now False for both.
Diffstat (limited to 'release/scripts')
| -rw-r--r-- | release/scripts/modules/bpy/utils/__init__.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 6 |
2 files changed, 4 insertions, 4 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: |