blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Fix #112081: Incorrect Toolbar Context Highlighting #112153

Merged
Harley Acheson merged 1 commits from Harley/blender:ToolbarBlockHold into main 2023-09-08 17:38:19 +02:00
Conversation 0 Commits 1 Files Changed 1 +3 -1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/interface/interface_region_menu_popup.cc
View File

@ -345,7 +345,9 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
* This ensures we set an item to be active. */
if (but_activate) {
ARegion *region = CTX_wm_region(C);
if (region && region->regiontype == RGN_TYPE_TOOLS) {
if (region && region->regiontype == RGN_TYPE_TOOLS && but_activate->block &&
(but_activate->block->flag & UI_BLOCK_POPUP_HOLD))
{
/* In Toolbars, highlight the button with select color. */
but_activate->flag |= UI_SELECT_DRAW;
}