[Bf-blender-cvs] [d11a2dfe712] master: Cleanup: minor change to grease pencil material access

[Campbell Barton]

Commit: d11a2dfe712e917601ad60f82b3847532d4cacc7
Author: Campbell Barton
Date:   Thu Jul 16 10:44:37 2020 +1000
Branches: master
https://developer.blender.org/rBd11a2dfe712e917601ad60f82b3847532d4cacc7

Cleanup: minor change to grease pencil material access

Rename for clarity and avoid passing in the prefix length.

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

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 1f96fb85ad7..5e55d3b2bef 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@ -2259,11 +2259,13 @@ static Material *gpencil_add_material(Main *bmain,
   return mat_gp;
 }
 
-static int gpencil_material_find_index_byname(Object *ob, char *name, const int num)
+static int gpencil_material_find_index_by_name_prefix(Object *ob, const char *name_prefix)
 {
+  const int name_prefix_len = strlen(name_prefix);
   for (int i = 0; i < ob->totcol; i++) {
     Material *ma = BKE_object_material_get(ob, i + 1);
-    if ((ma != NULL) && (ma->gp_style != NULL) && (STREQLEN(ma->id.name + 2, name, num))) {
+    if ((ma != NULL) && (ma->gp_style != NULL) &&
+        (STREQLEN(ma->id.name + 2, name_prefix, name_prefix_len))) {
       return i;
     }
   }
@@ -2314,8 +2316,8 @@ void BKE_gpencil_convert_mesh(Main *bmain,
   MLoop *mloop = me_eval->mloop;
   int mpoly_len = me_eval->totpoly;
   int i;
-  int stroke_mat_index = gpencil_material_find_index_byname(ob_gp, "Stroke", 6);
-  int fill_mat_index = gpencil_material_find_index_byname(ob_gp, "Fill", 4);
+  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");
 
   /* 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 :