diff options
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_add_monkey.c')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_add_monkey.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/source/blender/editors/gpencil/gpencil_add_monkey.c b/source/blender/editors/gpencil/gpencil_add_monkey.c index d86bad7ef3c..4497d963c6d 100644 --- a/source/blender/editors/gpencil/gpencil_add_monkey.c +++ b/source/blender/editors/gpencil/gpencil_add_monkey.c @@ -50,19 +50,8 @@ typedef struct ColorTemplate { static int gpencil_monkey_color( Main *bmain, Object *ob, const ColorTemplate *pct, bool stroke, bool fill) { - short *totcol = BKE_object_material_len_p(ob); - Material *ma = NULL; - for (short i = 0; i < *totcol; i++) { - ma = BKE_gpencil_material(ob, i + 1); - if (STREQ(ma->id.name, pct->name)) { - return i; - } - } - - int idx; - - /* create a new one */ - ma = BKE_gpencil_object_material_new(bmain, ob, pct->name, &idx); + int index; + Material *ma = BKE_gpencil_object_material_ensure_by_name(bmain, ob, pct->name, &index); copy_v4_v4(ma->gp_style->stroke_rgba, pct->line); srgb_to_linearrgb_v4(ma->gp_style->stroke_rgba, ma->gp_style->stroke_rgba); @@ -81,7 +70,7 @@ static int gpencil_monkey_color( ma->gp_style->flag |= GP_MATERIAL_FILL_SHOW; } - return idx; + return index; } /* ***************************************************************** */ |