From d243a0b03a9ff80385a77342a55e2d99cb2eec98 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 3 Feb 2020 15:16:38 +1100 Subject: [PATCH] Fix T73553: Grease pencil poll crash with non-gpencil objects --- source/blender/editors/gpencil/gpencil_utils.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 9b1551fe2a5..4e4ec274a39 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -273,12 +273,10 @@ bGPdata *ED_annotation_data_get_active_direct(ID *screen_id, ScrArea *sa, Scene bGPdata *ED_gpencil_data_get_active(const bContext *C) { Object *ob = CTX_data_active_object(C); - if (ob == NULL) { + if ((ob == NULL) || (ob->type != OB_GPENCIL)) { return NULL; } - bGPdata *gpd = (bGPdata *)ob->data; - - return gpd; + return ob->data; } /* Get the active Grease Pencil datablock