archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Sergey Sharybin
2018-03-26 14:56:00 +02:00
parent 13f80a152a 3c45fdd171
commit 21aca14e43
15 changed files with 189 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/interface/interface_handlers.c
View File

@@ -7788,7 +7788,10 @@ static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState s
/* highlight has timers for tooltips and auto open */
if (state == BUTTON_STATE_HIGHLIGHT) {
but->flag &= ~UI_SELECT;
/* for list-items (that are not drawn with regular emboss), don't change selection based on hovering */
if (((but->flag & UI_BUT_LIST_ITEM) == 0) && (but->dragflag & UI_EMBOSS_NONE)) {
but->flag &= ~UI_SELECT;
}
button_tooltip_timer_reset(C, but);