diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 7 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 7 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index f2bd68a52ec..a866921f326 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -341,7 +341,12 @@ class DOPESHEET_MT_view(Menu): layout.separator() layout.prop(st, "use_realtime_update") - layout.prop(st, "show_sliders") + + # Sliders are always shown in the Shape Key Editor regardless of this setting. + col = layout.column() + col.active = context.space_data.mode != 'SHAPEKEY' + col.prop(st, "show_sliders") + layout.prop(st, "show_group_colors") layout.prop(st, "show_interpolation") layout.prop(st, "show_extremes") 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. */ diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 6e30e279ddc..0e5780012dd 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2007,12 +2007,6 @@ static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr) else { saction->action = NULL; } - - /* 2) enable 'show sliders' by default, since one of the main - * points of the ShapeKey Editor is to provide a one-stop shop - * for controlling the shapekeys, whose main control is the value - */ - saction->flag |= SACTION_SLIDERS; } /* make sure action stored is valid */ else if (saction->mode == SACTCONT_ACTION) { |