blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix T60753: Graph Editor showing cache curves regardless of filters 

This commit adds a datablock filtering option for cache files channels,
so that a shot with lots of these in addition to standard animation
(e.g. the Spring production files) don't become bogged down by these.

Furthermore, these channels also respect the "Only Selected" toggle too now.
This commit is contained in:
Joshua Leung 2019-01-31 15:42:59 +13:00
parent 744f633986
commit 65340ad73f
Notes: blender-bot 2023-02-14 08:38:11 +01:00 
Referenced by issue #60753, Graph Editor showing cache curves regardless of filters
4 changed files with 19 additions and 6 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

@ -148,6 +148,8 @@ class DopesheetFilterPopoverBase:
flow.prop(dopesheet, "show_textures", text="Textures")
if bpy.data.shape_keys:
flow.prop(dopesheet, "show_shapekeys", text="Shape Keys")
if bpy.data.cache_files:
flow.prop(dopesheet, "show_cache_files", text="Cache Files")
layout.separator()

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

@ -2980,9 +2980,11 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, b
}
/* Cache files level animations (frame duration and such). */
CacheFile *cache_file = ac->bmain->cachefiles.first;
for (; cache_file; cache_file = cache_file->id.next) {
items += animdata_filter_ds_cachefile(ac, anim_data, ads, cache_file, filter_mode);
if (!(ads->filterflag2 & ADS_FILTER_NOCACHEFILES) && !(ads->filterflag & ADS_FILTER_ONLYSEL)) {
CacheFile *cache_file = ac->bmain->cachefiles.first;
for (; cache_file; cache_file = cache_file->id.next) {
items += animdata_filter_ds_cachefile(ac, anim_data, ads, cache_file, filter_mode);
}
}
/* movie clip's animation */

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

@ -727,12 +727,12 @@ typedef struct bDopeSheet {
/** Flags to use for filtering data. */
int filterflag;
int filterflag2;
/** Standard flags. */
int flag;
/** Index+1 of channel to rename - only gets set by renaming operator. */
int renameIndex;
int pad;
} bDopeSheet;
@ -795,6 +795,11 @@ typedef enum eDopeSheet_FilterFlag {
ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM | ADS_FILTER_NOMAT | ADS_FILTER_NOLAM | ADS_FILTER_NOCUR | ADS_FILTER_NOPART | ADS_FILTER_NOARM | ADS_FILTER_NOSPK | ADS_FILTER_NOMODIFIERS),
} eDopeSheet_FilterFlag;
/* DopeSheet filter-flags - Overflow (filterflag2) */
typedef enum eDopeSheet_FilterFlag2 {
ADS_FILTER_NOCACHEFILES = (1 << 1),
} eDopeSheet_FilterFlag2;
/* DopeSheet general flags */
typedef enum eDopeSheet_Flag {
/** when summary is shown, it is collapsed, so all other channels get hidden */
@ -807,8 +812,6 @@ typedef enum eDopeSheet_Flag {
ADS_FLAG_FUZZY_NAMES = (1 << 2),
/** do not sort datablocks (mostly objects) by name (NOTE: potentially expensive operation) */
ADS_FLAG_NO_DB_SORT = (1 << 3),
/* NOTE: datablock filter flags continued (1 << 10) onwards... */
} eDopeSheet_Flag;

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

@ -483,6 +483,12 @@ static void rna_def_dopesheet(BlenderRNA *brna)
RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_SPEAKER, 0);
RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
prop = RNA_def_property(srna, "show_cache_files", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag2", ADS_FILTER_NOCACHEFILES);
RNA_def_property_ui_text(prop, "Display Cache Files", "Include visualization of cache file related animation data");
RNA_def_property_ui_icon(prop, ICON_FILE, 0);
RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
prop = RNA_def_property(srna, "show_gpencil", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOGPENCIL);
RNA_def_property_ui_text(prop, "Display Grease Pencil", "Include visualization of Grease Pencil related animation data and frames");