Merge branch 'blender-v2.82-release'

2020-02-03 15:29:57 +11:00
parent 5206124ce1 d243a0b03a
commit 3dc2b009ae
1 changed files with 2 additions and 4 deletions
--- 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