From 516afd0162cd2e217ec50ce522f87317b73f0088 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 8 Jul 2019 17:27:57 +0200 Subject: Implement Movieclip filter for action editors Allows to disable keyframes from movie clips in dopesheet. Reviewers: brecht Reviewed By: brecht Subscribers: sebastian_k Differential Revision: https://developer.blender.org/D5203 --- source/blender/editors/animation/anim_filter.c | 4 +++- source/blender/makesdna/DNA_action_types.h | 1 + source/blender/makesrna/intern/rna_action.c | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index d71a7808f42..2d16ce30d31 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -3151,7 +3151,9 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac, } /* movie clip's animation */ - items += animdata_filter_dopesheet_movieclips(ac, anim_data, ads, filter_mode); + if (!(ads->filterflag2 & ADS_FILTER_NOMOVIECLIPS) && !(ads->filterflag & ADS_FILTER_ONLYSEL)) { + items += animdata_filter_dopesheet_movieclips(ac, anim_data, ads, filter_mode); + } /* Scene-linked animation - e.g. world, compositing nodes, scene anim * (including sequencer currently). */ diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index c8a76791cef..a4cd31a1357 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -772,6 +772,7 @@ typedef enum eDopeSheet_FilterFlag { /* DopeSheet filter-flags - Overflow (filterflag2) */ typedef enum eDopeSheet_FilterFlag2 { ADS_FILTER_NOCACHEFILES = (1 << 1), + ADS_FILTER_NOMOVIECLIPS = (1 << 2), } eDopeSheet_FilterFlag2; /* DopeSheet general flags */ diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index ba5355a8d95..4ad2aa55c75 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -571,6 +571,13 @@ static void rna_def_dopesheet(BlenderRNA *brna) RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_GREASEPENCIL, 0); RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); + prop = RNA_def_property(srna, "show_movieclips", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag2", ADS_FILTER_NOMOVIECLIPS); + RNA_def_property_ui_text( + prop, "Display Movie Clips", "Include visualization of movie clip related animation data"); + RNA_def_property_ui_icon(prop, ICON_TRACKER, 0); + RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); + /* GPencil Mode Settings */ prop = RNA_def_property(srna, "show_gpencil_3d_only", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_GP_3DONLY); -- cgit v1.2.3