mask and grease pencil now display in the dope sheet summery

2 files changed, 14 insertions, 4 deletions

diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index 46e1eb98dae..a6d1ac64bbe 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -2397,13 +2397,15 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo
 				
 			case ANIMCONT_GPENCIL:
 			{
-				items = animdata_filter_gpencil(anim_data, data, filter_mode);
+				if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
+					items = animdata_filter_gpencil(anim_data, data, filter_mode);
 			}
 			break;
 
 			case ANIMCONT_MASK:
 			{
-				items = animdata_filter_mask(anim_data, data, filter_mode);
+				if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
+					items = animdata_filter_mask(anim_data, data, filter_mode);
 			}
 			break;
 
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index e6fc4d5a168..46a89963ad9 100644
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -847,9 +847,17 @@ void summary_to_keylist(bAnimContext *ac, DLRBT_Tree *keys, DLRBT_Tree *blocks)
 		ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
 		
 		/* loop through each F-Curve, grabbing the keyframes */
-		for (ale = anim_data.first; ale; ale = ale->next)
+		for (ale = anim_data.first; ale; ale = ale->next) {
 			fcurve_to_keylist(ale->adt, ale->data, keys, blocks);
-		
+
+			if (ale->datatype == ALE_MASKLAY) {
+				mask_to_keylist(ac->ads, ale->data, keys);
+			}
+			else if (ale->datatype == ALE_GPFRAME) {
+				gpl_to_keylist(ac->ads, ale->data, keys);
+			}
+		}
+
 		BLI_freelistN(&anim_data);
 	}
 }