[Bf-blender-cvs] [f12fad39570] greasepencil-object: GPencil: Simplify Poll function

[Antonio Vazquez]

Commit: f12fad39570b3b82d6c82cf3e72c615887b87fdb
Author: Antonio Vazquez
Date:   Wed May 5 15:52:25 2021 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf12fad39570b3b82d6c82cf3e72c615887b87fdb

GPencil: Simplify Poll function

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

M	source/blender/editors/gpencil/gpencil_data.c

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

diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 60d5ed411e5..b6888dc3769 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -3598,13 +3598,6 @@ static bool gpencil_materials_append_to_object_poll(bContext *C)
     return false;
   }
 
-  bGPdata *gpd = (bGPdata *)ob->data;
-  bGPDlayer *gpl = BKE_gpencil_layer_active_get(gpd);
-
-  if (gpl == NULL) {
-    return false;
-  }
-
   /* check there are more grease pencil objects */
   LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
     if ((base->object != ob) && (base->object->type == OB_GPENCIL)) {
@@ -3642,7 +3635,7 @@ static int gpencil_materials_append_to_object_exec(bContext *C, wmOperator *op)
   for (short i = 0; i < ob_src->totcol; i++) {
     Material *ma_src = BKE_object_material_get(ob_src, i + 1);
     if (ma_src != NULL) {
-      int idx = BKE_gpencil_object_material_ensure(bmain, ob_dst, ma_src);
+      BKE_gpencil_object_material_ensure(bmain, ob_dst, ma_src);
     }
   }