[Bf-blender-cvs] [b7d47e9892d] property-search-ui: Property Search: Apply filter to operator buttons

[Hans Goudey]

Commit: b7d47e9892dbdea65217cd77e773ca0078887225
Author: Hans Goudey
Date:   Tue Jul 7 14:44:30 2020 -0400
Branches: property-search-ui
https://developer.blender.org/rBb7d47e9892dbdea65217cd77e773ca0078887225

Property Search: Apply filter to operator buttons

===================================================================

M	source/blender/editors/interface/interface_layout.c

===================================================================

diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 2825cb13bec..a904848e637 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -5293,23 +5293,24 @@ static void ui_layout_free_hide_buttons(uiLayout *layout)
 
 static bool ui_button_search_tag(uiBut *but, char *search_filter)
 {
-  if (BLI_strcasestr(but->str, search_filter)) {
-    return true;
-  }
-  if (BLI_strcasestr(RNA_property_ui_name(but->rnaprop), search_filter)) {
-    return true;
+  if (but->optype != NULL) {
+    if (BLI_strcasestr(but->optype->name, search_filter)) {
+      return true;
+    }
   }
-  /* HANS-TODO: This isn't working. but->optype is always null for some reason?? */
-  // if (but->optype != NULL) {
-  //   if (BLI_strcasestr(but->optype->name, search_filter)) {
-  //     return true;
-  //   }
-  // }
+  if (but->rnaprop != NULL) {
+    if (BLI_strcasestr(but->str, search_filter)) {
+      return true;
+    }
+    if (BLI_strcasestr(RNA_property_ui_name(but->rnaprop), search_filter)) {
+      return true;
+    }
 #ifdef PROPERTY_SEARCH_USE_TOOLTIPS
-  if (BLI_strcasestr(RNA_property_description(but->rnaprop), search_filter)) {
-    return true;
-  }
+    if (BLI_strcasestr(RNA_property_description(but->rnaprop), search_filter)) {
+      return true;
+    }
 #endif
+  }
 
   return false;
 }
@@ -5323,12 +5324,6 @@ static bool ui_button_search_tag(uiBut *but, char *search_filter)
 static void ui_block_search_filter_tag_buttons(uiBlock *block)
 {
   LISTBASE_FOREACH (uiBut *, but, &block->buttons) {
-    /* Flag all buttons with no RNA property. This is probably too strict. */
-    if (but->rnaprop == NULL) {
-      but->flag |= UI_FILTERED;
-      continue;
-    }
-
     /* Flag all label buttons, we don't want to re-display them. */
     if (but->type == UI_BTYPE_LABEL) {
       but->flag |= UI_FILTERED;