[Bf-blender-cvs] [f34ca933a80] master: UI: include the category for add-ons search
Vincent Blankfield
noreply at git.blender.org
Wed Dec 16 07:52:02 CET 2020
Commit: f34ca933a806b83be957f69835c7a6033fe5ca2c
Author: Vincent Blankfield
Date: Wed Dec 16 16:28:44 2020 +1100
Branches: master
https://developer.blender.org/rBf34ca933a806b83be957f69835c7a6033fe5ca2c
UI: include the category for add-ons search
This lead to some confusion, see T83747.
Now the category is included in the search when the category is "All".
Ref D9848
===================================================================
M release/scripts/startup/bl_ui/space_userpref.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index ae45b9799f1..1d59fe4bfa2 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1881,12 +1881,12 @@ class USERPREF_PT_addons(AddOnPanel, Panel):
is_visible = is_visible and is_enabled
if is_visible:
- if search and search not in info["name"].lower():
- if info["author"]:
- if search not in info["author"].lower():
- continue
- else:
- continue
+ if search and not (
+ (search in info["name"].lower()) or
+ (info["author"] and (search in info["author"].lower())) or
+ ((filter == "All") and (search in info["category"].lower()))
+ ):
+ continue
# Skip 2.7x add-ons included with Blender, unless in debug mode.
is_addon_27x = info.get("blender", (0,)) < (2, 80)
More information about the Bf-blender-cvs
mailing list