diff options
author | Julian Eisel <julian@blender.org> | 2021-11-25 19:26:53 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2021-11-25 19:26:53 +0300 |
commit | 4a3f99ad5a2e6e87156baa5c6f2184df8ea09683 (patch) | |
tree | 295575c89f2435f8a74ca99a7a2d2d9430f81421 /source/blender/editors/interface/interface.c | |
parent | 3652f5f758aafa2103519c3c0663ba8643b554c1 (diff) | |
parent | 5a11c6e558c6581cc07d2a1d67db460241255f09 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/editors/interface/interface.c')
-rw-r--r-- | source/blender/editors/interface/interface.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 55fab04e9a4..b9f68d8d83c 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -2062,24 +2062,11 @@ void UI_block_draw(const bContext *C, uiBlock *block) ui_draw_menu_back(&style, block, &rect); } else if (block->panel) { - bool show_background = region->alignment != RGN_ALIGN_FLOAT; - if (show_background) { - if (block->panel->type && (block->panel->type->flag & PANEL_TYPE_NO_HEADER)) { - if (region->regiontype == RGN_TYPE_TOOLS) { - /* We never want a background around active tools. */ - show_background = false; - } - else { - /* Without a header there is no background except for region overlap. */ - show_background = region->overlap != 0; - } - } - } ui_draw_aligned_panel(&style, block, &rect, UI_panel_category_is_visible(region), - show_background, + UI_panel_should_show_background(region, block->panel->type), region->flag & RGN_FLAG_SEARCH_FILTER_ACTIVE); } |