[Bf-blender-cvs] [b210ead73be] blender2.8: Dopesheet-Timeline: Channels list now gets hidden automatically when switching to dopesheet-timeline
Joshua Leung
noreply at git.blender.org
Fri Apr 20 19:06:52 CEST 2018
Commit: b210ead73bef8b1f96ed5186a3c8006ff82394dd
Author: Joshua Leung
Date: Fri Apr 20 12:20:09 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb210ead73bef8b1f96ed5186a3c8006ff82394dd
Dopesheet-Timeline: Channels list now gets hidden automatically when switching to dopesheet-timeline
===================================================================
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 037bd581cf5..45fb1920387 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -1292,6 +1292,7 @@ static void rna_SpaceDopeSheetEditor_action_update(bContext *C, PointerRNA *ptr)
static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr)
{
SpaceAction *saction = (SpaceAction *)(ptr->data);
+ ScrArea *sa = CTX_wm_area(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
Object *obact = OBACT(view_layer);
@@ -1324,12 +1325,21 @@ static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr)
/* Collapse summary channel and hide channel list for timeline */
if (saction->mode == SACTCONT_TIMELINE) {
saction->ads.flag |= ADS_FLAG_SUMMARY_COLLAPSED;
- /* TODO: Set flags to hide the region */
}
- else {
- /* TODO: Set flags to unhide the region */
+
+ if (sa && sa->spacedata.first == saction) {
+ ARegion *channels_region = BKE_area_find_region_type(sa, RGN_TYPE_CHANNELS);
+ if (channels_region) {
+ if (saction->mode == SACTCONT_TIMELINE) {
+ channels_region->flag |= RGN_FLAG_HIDDEN;
+ }
+ else {
+ channels_region->flag &= ~RGN_FLAG_HIDDEN;
+ }
+ ED_region_visibility_change_update(C, channels_region);
+ }
}
-
+
/* recalculate extents of channel list */
saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
}
More information about the Bf-blender-cvs
mailing list