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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-06-29 22:13:35 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-06-29 22:23:13 +0300
commit728e92422ef3ec97a72db37572146498280e730e (patch)
treeba8a91970d4a684a5fe2d92d54377f8167021928 /source/blender/editors/interface/interface_handlers.c
parentccacf3ae3cff9e0291a3fa77991c4a94edf5043f (diff)
Fix T54524: keyframe and driver colors not showing in shape key list.
This reverts commit 357b72e0a7d4a270bf1273102595446ccca16259 which caused the issue, we need a better fix for that cosmetic issue from T50862. For now displaying keyframes and drivers is the more important one.
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
-rw-r--r--source/blender/editors/interface/interface_handlers.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 1bb479935c8..d8771ebf93f 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -7246,10 +7246,7 @@ static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState s
/* highlight has timers for tooltips and auto open */
if (state == BUTTON_STATE_HIGHLIGHT) {
- /* 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;
- }
+ but->flag &= ~UI_SELECT;
button_tooltip_timer_reset(C, but);