[Bf-blender-cvs] [de2cafef299] greasepencil-object: Fix: Some more sanity checks for cases not handled

[Joshua Leung]

Commit: de2cafef299d75db10ca5674212b8534dc20abff
Author: Joshua Leung
Date:   Sun Oct 29 17:10:16 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rBde2cafef299d75db10ca5674212b8534dc20abff

Fix: Some more sanity checks for cases not handled

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

M	source/blender/editors/screen/screen_ops.c
M	source/blender/editors/space_time/space_time.c

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

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 006e6882f68..b9a2e4c0f32 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -2273,7 +2273,10 @@ static int keyframe_jump_exec(bContext *C, wmOperator *op)
 
 	if (ob) {
 		ob_to_keylist(&ads, ob, &keys, NULL);
-		gpencil_to_keylist(&ads, ob->data, &keys);
+		
+		if (ob->type == OB_GPENCIL) {
+			gpencil_to_keylist(&ads, ob->data, &keys);
+		}
 	}
 	
 	{
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index 72b512d09fc..6604c5ff22c 100644
--- a/source/blender/editors/space_time/space_time.c
+++ b/source/blender/editors/space_time/space_time.c
@@ -433,9 +433,10 @@ static void time_draw_keyframes(const bContext *C, ARegion *ar)
 	UI_GetThemeColor3ubv(TH_TIME_GP_KEYFRAME, color);
 
 	if (scene->gpd) {
+		// XXX: Review this (aligorith)
 		time_draw_idblock_keyframes(v2d, (ID *)scene->gpd, onlysel, color);
 	}
-	if (ob && ob->data) {
+	if (ob && ob->data && (ob->type == OB_GPENCIL)) {
 		time_draw_idblock_keyframes(v2d, (ID *)ob->data, onlysel, color);
 	}