[Bf-blender-cvs] [70619904a5a] greasepencil-object: GPencil: Fix error after merge

[Antonio Vazquez]

Commit: 70619904a5a3d505600840779adf6d5d2f702b98
Author: Antonio Vazquez
Date:   Thu Sep 10 17:28:13 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB70619904a5a3d505600840779adf6d5d2f702b98

GPencil: Fix error after merge

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

M	source/blender/blenkernel/intern/gpencil_geom.c

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

diff --git a/source/blender/blenkernel/intern/gpencil_geom.c b/source/blender/blenkernel/intern/gpencil_geom.c
index 3469430aad1..f7eb458d1dc 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@ -54,9 +54,6 @@
 #include "BKE_material.h"
 #include "BKE_object.h"
 
-//#include "UI_view2d.h"
-//#include "ED_view3d.h"
-
 #include "DEG_depsgraph_query.h"
 
 /* GP Object - Boundbox Support */
@@ -2300,8 +2297,8 @@ void BKE_gpencil_convert_mesh(Main *bmain,
   MPoly *mp, *mpoly = me_eval->mpoly;
   MLoop *mloop = me_eval->mloop;
   int mpoly_len = me_eval->totpoly;
-  int stroke_mat_index = gpencil_material_find_index_by_name_prefix(ob_gp, "Stroke");
-  int fill_mat_index = gpencil_material_find_index_by_name_prefix(ob_gp, "Fill");
+  int stroke_mat_index = BKE_gpencil_material_find_index_by_name_prefix(ob_gp, "Stroke");
+  int fill_mat_index = BKE_gpencil_material_find_index_by_name_prefix(ob_gp, "Fill");
 
   /* If the object has enough materials means it was created in a previous step. */
   const bool create_mat = ((ob_gp->totcol > 0) && (ob_gp->totcol >= ob_mesh->totcol)) ? false :