[Bf-blender-cvs] [11b89dd56cf] property-search-ui: Property Search: Don't remove layouts with search turned off

[Hans Goudey]

Commit: 11b89dd56cfee6ae01a6a518ca088ef8e4cf34af
Author: Hans Goudey
Date:   Fri Jun 26 14:16:44 2020 -0400
Branches: property-search-ui
https://developer.blender.org/rB11b89dd56cfee6ae01a6a518ca088ef8e4cf34af

Property Search: Don't remove layouts with search turned off

This mostly fixes panel headers, although they still end up with the same
problems as other layouts, with a minimum column size enforced for some
reason and misplaced labels.

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

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 a041576db88..a11dbc5acf1 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -5279,7 +5279,7 @@ static void ui_block_search_filter_tag_buttons(uiBlock *block)
 static bool ui_layout_search_filter_clean_recursive(uiLayout *layout)
 {
   /* Remove all search filtered button items. */
-  bool layout_emptied = true;
+  bool layout_emptied = uiLayoutGetPropSearch(layout);
   if (uiLayoutGetPropSearch(layout)) {
     LISTBASE_FOREACH_MUTABLE (uiItem *, item, &layout->items) {
       if (item->type == ITEM_BUTTON) {
@@ -5436,7 +5436,7 @@ static bool ui_block_search_layout(uiBlock *block)
 
 #ifdef DEBUG_LAYOUT_ROOTS
   if (block->panel && (block->panel->flag & PNL_SELECT)) {
-    printf("\nBEFORE\n");
+    printf("\nBEFORE %s %p\n", block->name, block);
     LISTBASE_FOREACH (uiLayoutRoot *, root, &block->layouts) {
       debug_print_layout((uiItem *)root->layout, 0, false);
     }