diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-08 01:56:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-08 01:56:22 +0300 |
| commit | bcf1997ac27d43d48aa60e1e2cd3c9e883cf620c (patch) | |
| tree | aa7e0d20afb2849fd99c9982159432f86c8c4089 /release | |
| parent | f12d2adc870e4bc032f49b9edae85c3b0366b406 (diff) | |
| parent | 9ccb70f202e75353a102ef60ec688c05ab63dbd0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 8a9bd133eb0..2dac1cb4c78 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -22,7 +22,6 @@ from bpy.types import ( Header, Menu, Panel, - Operator, ) from bpy.app.translations import pgettext_iface as iface_ from bpy.app.translations import contexts as i18n_contexts @@ -1284,8 +1283,13 @@ class USERPREF_PT_addons(Panel): userpref = context.user_preferences used_ext = {ext.module for ext in userpref.addons} - userpref_addons_folder = os.path.join(userpref.filepaths.script_directory, "addons") - scripts_addons_folder = bpy.utils.user_resource('SCRIPTS', "addons") + addon_user_dirs = tuple( + p for p in ( + os.path.join(userpref.filepaths.script_directory, "addons"), + bpy.utils.user_resource('SCRIPTS', "addons"), + ) + if p + ) # collect the categories that can be filtered on addons = [ @@ -1347,7 +1351,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((scripts_addons_folder, userpref_addons_folder)))) + (filter == "User" and (mod.__file__.startswith(addon_user_dirs))) ): if search and search not in info["name"].lower(): if info["author"]: |