[Bf-blender-cvs] [958a509c370] greasepencil-object: Filter dopesheet channel to OB_GPENCIL only

[Antonio Vazquez]

Commit: 958a509c370851c50a22ae48358f5c0f126285d3
Author: Antonio Vazquez
Date:   Tue May 29 17:34:43 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB958a509c370851c50a22ae48358f5c0f126285d3

Filter dopesheet channel to OB_GPENCIL only

This filter using ob->data is evaluated for any object type and this can produce problems.

In the future, when grease pencil dopesheet will be merge with "normal" dopesheet, this section must be recoded.

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

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 933168a1144..a60cc6fb353 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -2600,7 +2600,9 @@ static size_t animdata_filter_dopesheet_ob(bAnimContext *ac, ListBase *anim_data
 		}
 		
 		/* grease pencil */
-		if ((ob->data) && !(ads->filterflag & ADS_FILTER_NOGPENCIL)) {
+		if ((ob->type == OB_GPENCIL) && 
+			(ob->data) && !(ads->filterflag & ADS_FILTER_NOGPENCIL)) 
+		{
 			tmp_items += animdata_filter_ds_gpencil(ac, &tmp_data, ads, ob->data, filter_mode);
 		}
 	}