Commit: 636a690eb13793583977598ca33ffa0289b32f46
Author: Joshua Leung
Date: Thu Jun 21 17:18:35 2018 +1200
Branches: blender2.8
https://developer.blender.org/rB636a690eb13793583977598ca33ffa0289b32f46
Fix: Ensure that summary channel is enabled when creating timeline
===================================================================
M source/blender/blenloader/intern/versioning_280.c
M source/blender/makesrna/intern/rna_space.c
===================================================================
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) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
