Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2020-09-07 12:45:10 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-09-07 13:02:11 +0300
commita2921067994bdec012a5b9edc7168d10b1b0627c (patch)
tree848732180c3c346325159480b42f027609afe375 /source/blender/editors/animation/anim_filter.c
parentb351607996e467f89ce841630a84244fab6fe3f5 (diff)
Fix T80531: Dope Sheet Shape Key Editor search/filter not working
Looks like this has just not been implemented before. Use the name matching method used in other Dope Sheet UI modes. Maniphest Tasks: T80531 Differential Revision: https://developer.blender.org/D8824
Diffstat (limited to 'source/blender/editors/animation/anim_filter.c')
-rw-r--r--source/blender/editors/animation/anim_filter.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index b75437fff45..3416d72c021 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -1715,6 +1715,7 @@ static size_t animdata_filter_shapekey(bAnimContext *ac,
/* check if channels or only F-Curves */
if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
KeyBlock *kb;
+ bDopeSheet *ads = ac->ads;
/* loop through the channels adding ShapeKeys as appropriate */
for (kb = key->block.first; kb; kb = kb->next) {
@@ -1723,6 +1724,12 @@ static size_t animdata_filter_shapekey(bAnimContext *ac,
continue;
}
+ /* Skip shapekey if the name doesn't match the filter string. */
+ if (ads != NULL && ads->searchstr[0] != '\0' &&
+ name_matches_dopesheet_filter(ads, kb->name) == false) {
+ continue;
+ }
+
/* only work with this channel and its subchannels if it is editable */
if (!(filter_mode & ANIMFILTER_FOREDIT) || EDITABLE_SHAPEKEY(kb)) {
/* Only include this track if selected in a way consistent