Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-05-16 11:20:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-16 11:20:45 +0300
commitda37b8c24571a0d6e49d7103a634d47278fde26c (patch)
tree98345c39fa472d93baf420504ecc5cdc20df51c8 /source/blender/editors/interface
parent0e667723d4d51b061036384db29ce7926d437ddf (diff)
Minor change to last commit
Don't show a background for the toolbar.
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r--source/blender/editors/interface/interface.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index f334d4a921a..340aa389f3f 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1689,8 +1689,14 @@ void UI_block_draw(const bContext *C, uiBlock *block)
bool show_background = ar->alignment != RGN_ALIGN_FLOAT;
if (show_background) {
if (block->panel->type && (block->panel->type->flag & PNL_NO_HEADER)) {
- /* Without a header there is no background except for region overlap. */
- show_background = ar->overlap != 0;
+ if (ar->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 = ar->overlap != 0;
+ }
}
}
ui_draw_aligned_panel(&style, block, &rect, UI_panel_category_is_visible(ar), show_background);