blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

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
This commit is contained in:
Sergey Sharybin 2019-07-08 17:27:57 +02:00
parent ef5d0a927e
commit 516afd0162
Notes: blender-bot 2023-02-14 07:17:43 +01:00 
Referenced by issue #66325, Animation Keyframe Undo/Redo Bug
Referenced by issue #64483, Blender crash when we close the render window if we have selected Blener File in Outliner.
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_dopesheet.py
View File

@ -136,6 +136,8 @@ class DopesheetFilterPopoverBase:
flow.prop(dopesheet, "show_shapekeys", text="Shape Keys")
if bpy.data.cache_files:
flow.prop(dopesheet, "show_cache_files", text="Cache Files")
if bpy.data.movieclips:
flow.prop(dopesheet, "show_movieclips", text="Movie Clips")
layout.separator()

4
source/blender/editors/animation/anim_filter.c
View File

@ -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). */

1
source/blender/makesdna/DNA_action_types.h
View File

@ -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 */

7
source/blender/makesrna/intern/rna_action.c
View File

@ -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);