[Bf-blender-cvs] [68df739bb19] property-search-ui-v2: Merge branch 'master' into property-search-ui-v2

[Hans Goudey]

Commit: 68df739bb195144189c303a59fbc46328e4ef55c
Author: Hans Goudey
Date:   Wed Jul 29 17:21:13 2020 -0400
Branches: property-search-ui-v2
https://developer.blender.org/rB68df739bb195144189c303a59fbc46328e4ef55c

Merge branch 'master' into property-search-ui-v2

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



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

diff --cc source/blender/editors/include/UI_interface.h
index a3fc66484d0,2c42f3a5071..2cb4cca9f84
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@@ -676,10 -671,7 +676,10 @@@ enum 
  };
  void UI_block_theme_style_set(uiBlock *block, char theme_style);
  char UI_block_emboss_get(uiBlock *block);
- void UI_block_emboss_set(uiBlock *block, char dt);
+ void UI_block_emboss_set(uiBlock *block, char emboss);
 +bool UI_block_has_search_filter(const uiBlock *block);
 +bool UI_block_is_search_only(const uiBlock *block);
 +void UI_block_set_search_only(uiBlock *block, bool search_only);
  
  void UI_block_free(const struct bContext *C, uiBlock *block);
  void UI_blocklist_free(const struct bContext *C, struct ListBase *lb);
diff --cc source/blender/editors/interface/interface.c
index b8c0199cd28,b28a6f530f6..c053f252a7a
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@@ -3366,16 -3365,9 +3366,16 @@@ uiBlock *UI_block_begin(const bContext 
  
    block = MEM_callocN(sizeof(uiBlock), "uiBlock");
    block->active = 1;
-   block->dt = dt;
+   block->emboss = emboss;
    block->evil_C = (void *)C; /* XXX */
  
 +  /* Set the search filter for the properties editor. */
 +  if ((region && region->regiontype == RGN_TYPE_WINDOW) &&
 +      (area && area->spacetype == SPACE_PROPERTIES)) {
 +    SpaceProperties *sbuts = CTX_wm_space_properties(C);
 +    block->search_filter = sbuts->search_string;
 +  }
 +
    if (scn) {
      /* store display device name, don't lookup for transformations yet
       * block could be used for non-color displays where looking up for transformation