diff options
| author | Christoph Lendenfeld <ChrisLend> | 2020-10-07 13:22:22 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-10-07 13:41:55 +0300 |
| commit | 4a633fae8a04a72e0e0bd1f9a5b4d9b147814d11 (patch) | |
| tree | 4a5b7a2eb1e467dd41bc67f9c3f653b339ed39ca /source/blender/editors/animation/anim_channels_defines.c | |
| parent | 65a6caafce9f1cde7e128786daa90342c192900c (diff) | |
Fix T67776: Animation/value keyframe slider doesn't appear in dope sheet
Avoid overwriting user-chosen `SACTION_SLIDERS` flag when switching the
Dope Sheet editor to Shape Key mode. The Shape Key mode now ignores the
flag, and always shows the sliders.
The obvious limitation is that you can't hide the sliders in the Shape
Key editor anymore
Reviewed By: looch, sybren
Differential Revision: https://developer.blender.org/D9121
Diffstat (limited to 'source/blender/editors/animation/anim_channels_defines.c')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index cebf807d346..9f56bfd8d40 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -5330,9 +5330,12 @@ void ANIM_channel_draw_widgets(const bContext *C, * and wouldn't be able to auto-keyframe. * - Slider should start before the toggles (if they're visible) * to keep a clean line down the side. + * - Sliders are always drawn in Shapekey mode now. Prior to this + * the SACTION_SLIDERS flag would be set when changing into Shapekey mode. */ - if ((draw_sliders) && - ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE, ANIMTYPE_SHAPEKEY, ANIMTYPE_GPLAYER)) { + if (((draw_sliders) + && ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE, ANIMTYPE_SHAPEKEY, ANIMTYPE_GPLAYER)) + || ale->type == ANIMTYPE_SHAPEKEY) { /* adjust offset */ /* TODO: make slider width dynamic, * so that they can be easier to use when the view is wide enough. */ |