diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-09-24 19:22:30 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-09-24 19:22:30 +0300 |
| commit | 7fb0cb2b9320a1751779b5906c68a7cffdbcd71e (patch) | |
| tree | bafcac83b277844f1794debefbce57620cda8482 /source/blender/editors/screen/area.c | |
| parent | bdbe95578d54971d9e0c4957bdc3367ebae44363 (diff) | |
Cleanup: Remove unecessary storage of search filter in uiBlock
Since the search is applied all in one phase, there is no need to store
a reference to the search filter in every uiBlock. Instead just pass it
as an argument to UI_block_apply_search_filter.
Diffstat (limited to 'source/blender/editors/screen/area.c')
| -rw-r--r-- | source/blender/editors/screen/area.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index f06633c1c92..2e9f297b705 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -2607,7 +2607,6 @@ static void ed_panel_draw(const bContext *C, strncat(block_name, unique_panel_str, INSTANCED_PANEL_UNIQUE_STR_LEN); } uiBlock *block = UI_block_begin(C, region, block_name, UI_EMBOSS); - UI_block_set_search_filter(block, search_filter); UI_block_set_search_only(block, search_only); bool open; @@ -2634,7 +2633,7 @@ static void ed_panel_draw(const bContext *C, pt->draw_header_preset(C, panel); - UI_block_apply_search_filter(block); + UI_block_apply_search_filter(block, search_filter); UI_block_layout_resolve(block, &xco, &yco); UI_block_translate(block, headerend - xco, 0); panel->layout = NULL; @@ -2666,7 +2665,7 @@ static void ed_panel_draw(const bContext *C, pt->draw_header(C, panel); - UI_block_apply_search_filter(block); + UI_block_apply_search_filter(block, search_filter); UI_block_layout_resolve(block, &xco, &yco); panel->labelofs = xco - labelx; panel->layout = NULL; @@ -2703,7 +2702,7 @@ static void ed_panel_draw(const bContext *C, pt->draw(C, panel); - UI_block_apply_search_filter(block); + UI_block_apply_search_filter(block, search_filter); UI_block_layout_resolve(block, &xco, &yco); panel->layout = NULL; |