From c0a8a29ae68f95bc0e0843774700868c19af1407 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Tue, 26 Jun 2018 21:35:31 +1200 Subject: AnimEditors: Remove the toggles to enable name/collection-based filtering Now the name/collection filters run when there's some text, and don't run when the box is empty, thus reducing an extra step that was needed before these options could be used. --- source/blender/makesdna/DNA_action_types.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blender/makesdna/DNA_action_types.h') diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index b20765ae187..0546dcb1a6c 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -598,8 +598,8 @@ typedef struct bDopeSheet { ID *source; /* currently ID_SCE (for Dopesheet), and ID_SC (for Grease Pencil) */ ListBase chanbase; /* cache for channels (only initialized when pinned) */ // XXX not used! - struct Collection *filter_grp; /* object group for ADS_FILTER_ONLYOBGROUP filtering option */ - char searchstr[64]; /* string to search for in displayed names of F-Curves for ADS_FILTER_BY_FCU_NAME filtering option */ + struct Collection *filter_grp; /* object group for option to only include objects that belong to this Collection */ + char searchstr[64]; /* string to search for in displayed names of F-Curves, or NlaTracks/GP Layers/etc. */ int filterflag; /* flags to use for filtering data */ int flag; /* standard flags */ @@ -621,7 +621,6 @@ typedef enum eDopeSheet_FilterFlag { /* general filtering */ ADS_FILTER_SUMMARY = (1 << 4), /* for 'DopeSheet' Editors - include 'summary' line */ - ADS_FILTER_ONLYOBGROUP = (1 << 5), /* only the objects in the specified object group get used */ /* datatype-based filtering */ ADS_FILTER_NOSHAPEKEYS = (1 << 6), @@ -650,7 +649,6 @@ typedef enum eDopeSheet_FilterFlag { /* general filtering 3 */ ADS_FILTER_INCL_HIDDEN = (1 << 26), /* include 'hidden' channels too (i.e. those from hidden Objects/Bones) */ - ADS_FILTER_BY_FCU_NAME = (1 << 27), /* for F-Curves, filter by the displayed name (i.e. to isolate all Location curves only) */ ADS_FILTER_ONLY_ERRORS = (1 << 28), /* show only F-Curves which are disabled/have errors - for debugging drivers */ /* GPencil Mode */ -- cgit v1.2.3