[Bf-blender-cvs] [d46317cf3c5] master: Fix T101775: grease pencil keyframe not filtered in dopesheet summary

[Amelie Fondevilla]

Commit: d46317cf3c5eac11d9a034ed1c14523d5302340c
Author: Amelie Fondevilla
Date:   Tue Nov 15 09:23:19 2022 +0100
Branches: master
https://developer.blender.org/rBd46317cf3c5eac11d9a034ed1c14523d5302340c

Fix T101775: grease pencil keyframe not filtered in dopesheet summary

Grease pencil data keyframes were listed twice in the summary.

First by the generic object data listing,
which did not handle properly grease pencil objects,
and did not account for the grease pencil filter.
Second by the specific grease pencil function.

Now only the second call is made,
and the filter hides keyframes in summary as well.

Reviewed By : Jeroen Bakker, Falk David

Differential Revision: https://developer.blender.org/D16369

===================================================================

M	source/blender/editors/animation/anim_filter.c

===================================================================

diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index 3a04873588d..255b9cdffbe 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -2826,7 +2826,7 @@ static size_t animdata_filter_dopesheet_ob(
     }
 
     /* object data */
-    if (ob->data) {
+    if ((ob->data) && (ob->type != OB_GPENCIL)) {
       tmp_items += animdata_filter_ds_obdata(ac, &tmp_data, ads, ob, filter_mode);
     }