[Bf-blender-cvs] [d952d1792ab] master: Merge branch 'blender-v2.91-release'

[Hans Goudey]

Commit: d952d1792ab167b2b3cc9fdde26d70a5ec9641b0
Author: Hans Goudey
Date:   Tue Nov 17 10:17:00 2020 -0500
Branches: master
https://developer.blender.org/rBd952d1792ab167b2b3cc9fdde26d70a5ec9641b0

Merge branch 'blender-v2.91-release'

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



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

diff --cc source/blender/blenkernel/BKE_screen.h
index 8e370ed27c5,35a3d0415a8..68c341692c2
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@@ -278,19 -275,6 +278,21 @@@ typedef struct PanelType 
    ExtensionRNA rna_ext;
  } PanelType;
  
 +/* #PanelType.flag */
 +enum {
 +  PANEL_TYPE_DEFAULT_CLOSED = (1 << 0),
 +  PANEL_TYPE_NO_HEADER = (1 << 1),
 +  /** Makes buttons in the header shrink/stretch to fill full layout width. */
 +  PANEL_TYPE_HEADER_EXPAND = (1 << 2),
 +  PANEL_TYPE_LAYOUT_VERT_BAR = (1 << 3),
 +  /** This panel type represents data external to the UI. */
 +  PANEL_TYPE_INSTANCED = (1 << 4),
 +  /** Draw panel like a box widget. */
 +  PANEL_TYPE_DRAW_BOX = (1 << 6),
++  /** Don't search panels with this type during property search. */
++  PANEL_TYPE_NO_SEARCH = (1 << 7),
 +};
 +
  /* uilist types */
  
  /* Draw an item in the uiList */
diff --cc source/blender/editors/interface/interface_layout.c
index df7fd3dee0e,03a017b5d4a..6267681bb4d
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@@ -5169,6 -5167,10 +5169,10 @@@ bool UI_block_apply_search_filter(uiBlo
      return false;
    }
  
 -  if (block->panel && block->panel->type && block->panel->type->flag & PNL_NO_SEARCH) {
++  if (block->panel && block->panel->type && block->panel->type->flag & PANEL_TYPE_NO_SEARCH) {
+     return false;
+   }
+ 
    const bool panel_label_matches = block_search_panel_label_matches(block, search_filter);
  
    const bool has_result = (panel_label_matches) ?
diff --cc source/blender/editors/screen/area.c
index 690d6c8055a,a5858d3d65c..73e11328af6
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@@ -3089,6 -3080,11 +3089,11 @@@ static bool panel_property_search(cons
    uiBlock *block = UI_block_begin(C, region, panel_type->idname, UI_EMBOSS);
    UI_block_set_search_only(block, true);
  
+   /* Skip panels that give meaningless search results. */
 -  if (panel_type->flag & PNL_NO_SEARCH) {
++  if (panel_type->flag & PANEL_TYPE_NO_SEARCH) {
+     return false;
+   }
+ 
    if (panel == NULL) {
      bool open; /* Dummy variable. */
      panel = UI_panel_begin(region, &region->panels, block, panel_type, panel, &open);
diff --cc source/blender/editors/space_buttons/buttons_context.c
index 922ef8dde99,b31879e3745..553782e2c0f
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@@ -1216,7 -1182,7 +1216,7 @@@ void buttons_context_register(ARegionTy
    strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
    pt->poll = buttons_panel_context_poll;
    pt->draw = buttons_panel_context_draw;
-   pt->flag = PANEL_TYPE_NO_HEADER;
 -  pt->flag = PNL_NO_HEADER | PNL_NO_SEARCH;
++  pt->flag = PANEL_TYPE_NO_HEADER | PANEL_TYPE_NO_SEARCH;
    BLI_addtail(&art->paneltypes, pt);
  }