diff options
| author | Joshua Leung <aligorith@gmail.com> | 2018-06-21 08:18:35 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2018-06-21 08:56:11 +0300 |
| commit | 636a690eb13793583977598ca33ffa0289b32f46 (patch) | |
| tree | a07be26006b133dd5b0a91adb3e431f7b5333de6 /source/blender | |
| parent | b081436d1c82f46ffa22bca5c72f0bd3cb20b5f1 (diff) | |
Fix: Ensure that summary channel is enabled when creating timeline
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index fcc7d39c539..39be7dda054 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -144,6 +144,7 @@ static void do_version_area_change_space_to_space_action(ScrArea *area, const Sc saction->mode = SACTCONT_TIMELINE; saction->ads.flag |= ADS_FLAG_SUMMARY_COLLAPSED; + saction->ads.filterflag |= ADS_FILTER_SUMMARY; } /** diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index f531e4e2041..458be5bb8f9 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1500,9 +1500,10 @@ static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr) saction->action = NULL; } - /* Collapse summary channel and hide channel list for timeline */ + /* Collapse (and show) summary channel and hide channel list for timeline */ if (saction->mode == SACTCONT_TIMELINE) { saction->ads.flag |= ADS_FLAG_SUMMARY_COLLAPSED; + saction->ads.filterflag |= ADS_FILTER_SUMMARY; } if (sa && sa->spacedata.first == saction) { |