[Bf-blender-cvs] [9dd5faa617b] temp-gpencil-interpolate: GPencil: Fix merge errors

[Antonio Vazquez]

Commit: 9dd5faa617b4bbcd5145728c4ed441d68e73b28b
Author: Antonio Vazquez
Date:   Sun Jan 17 13:33:51 2021 +0100
Branches: temp-gpencil-interpolate
https://developer.blender.org/rB9dd5faa617b4bbcd5145728c4ed441d68e73b28b

GPencil: Fix merge errors

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c
index 93c8330cdd9..62d9c43b901 100644
--- a/source/blender/editors/gpencil/gpencil_interpolate.c
+++ b/source/blender/editors/gpencil/gpencil_interpolate.c
@@ -152,7 +152,7 @@ static void gpencil_stroke_pair_table(bContext *C,
       continue;
     }
     /* check if the color is editable */
-    if (ED_gpencil_stroke_color_use(tgpi->ob, tgpil->gpl, gps_from) == false) {
+    if (ED_gpencil_stroke_material_editable(tgpi->ob, tgpil->gpl, gps_from) == false) {
       continue;
     }
     /* Try to get the related stroke. */
@@ -1128,7 +1128,7 @@ static int gpencil_interpolate_seq_exec(bContext *C, wmOperator *op)
         continue;
       }
       /* Check if the color is editable. */
-      if (ED_gpencil_stroke_color_use(ob, gpl, gps_from) == false) {
+      if (ED_gpencil_stroke_material_editable(ob, gpl, gps_from) == false) {
         continue;
       }
       /* Try to get the related stroke. */