diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2021-04-25 19:40:04 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2021-04-25 19:40:04 +0300 |
| commit | 20142b08239a9fd5e147189462ca7c7bbfd0a972 (patch) | |
| tree | 27f8c111f894e09da08bf14b8b02c1b878938a6c /source | |
| parent | ae58db91a2f5399b479d9b2789603a68689dc99e (diff) | |
| parent | f1cf706758e333040d4d2d5dd368b4db511a25b5 (diff) | |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/gpencil_geom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/gpencil_geom.c b/source/blender/blenkernel/intern/gpencil_geom.c index 27c2d9e146b..8ae5a9e2d1f 100644 --- a/source/blender/blenkernel/intern/gpencil_geom.c +++ b/source/blender/blenkernel/intern/gpencil_geom.c @@ -2433,7 +2433,7 @@ bool BKE_gpencil_convert_mesh(Main *bmain, Material *ma = BKE_object_material_get(ob_mesh, mp->mat_nr + 1); make_element_name( ob_mesh->id.name + 2, (ma != NULL) ? ma->id.name + 2 : "Fill", 64, element_name); - mat_idx = gpencil_material_find_index_by_name(ob_gp, element_name); + mat_idx = BKE_gpencil_material_find_index_by_name_prefix(ob_gp, element_name); if (mat_idx == -1) { float color[4]; if (ma != NULL) { |