diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-13 15:23:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-13 15:23:04 +0400 |
| commit | ee67123748c80463164278e1f295c5ae6ff728f7 (patch) | |
| tree | 2673cb1d25c2dbca85fd41b83b534cdd0e73ed95 /release | |
| parent | 4ef69febebf88ddd7b912eea07145276725c81bd (diff) | |
code cleanup: minor edits on recent commit.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/modules/addon_utils.py | 5 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py index 2aaef769c0b..7e604c5de4c 100644 --- a/release/scripts/modules/addon_utils.py +++ b/release/scripts/modules/addon_utils.py @@ -323,9 +323,8 @@ def disable(module_name, default_set=True): import traceback traceback.print_exc() else: - if mod: state = "enabled" - else: state = "loaded" - print("addon_utils.disable: %s not %s." % (module_name, state)) + print("addon_utils.disable: %s not %s." % + (module_name, "disabled" if mod is None else "loaded")) # could be in more then once, unlikely but better do this just in case. addons = _bpy.context.user_preferences.addons diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 87d8a13e856..d5dd07610b6 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1040,7 +1040,7 @@ class USERPREF_PT_addons(Panel): userpref = context.user_preferences used_ext = {ext.module for ext in userpref.addons} - userpref_addons_folder = os.path.join(bpy.context.user_preferences.filepaths.script_directory,"addons") + userpref_addons_folder = os.path.join(userpref.filepaths.script_directory, "addons") scripts_addons_folder = bpy.utils.user_resource('SCRIPTS', "addons") # collect the categories that can be filtered on @@ -1092,9 +1092,7 @@ class USERPREF_PT_addons(Panel): (filter == info["category"]) or (filter == "Enabled" and is_enabled) or (filter == "Disabled" and not is_enabled) or - (filter == "User" and - ( mod.__file__.startswith(userpref_addons_folder) or - mod.__file__.startswith(scripts_addons_folder))) + (filter == "User" and (mod.__file__.startswith(scripts_addons_folder, userpref_addons_folder))) ): if search and search not in info["name"].lower(): |