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_layout.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_layout.c')
-rw-r--r--source/blender/editors/interface/interface_layout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index c9145b7d247..35bd4da4d39 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1486,7 +1486,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
}
/* Mark non-embossed textfields inside a listbox. */
- if (but && (block->flag & UI_BLOCK_LIST_ITEM) && (but->dt & UI_EMBOSS_NONE)) {
+ if (but && (block->flag & UI_BLOCK_LIST_ITEM) && (but->type == UI_BTYPE_TEXT) && (but->dt & UI_EMBOSS_NONE)) {
UI_but_flag_enable(but, UI_BUT_LIST_ITEM);
}