diff options
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_add_stroke.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_add_stroke.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/editors/gpencil/gpencil_add_stroke.c b/source/blender/editors/gpencil/gpencil_add_stroke.c index 60a4404beaf..39a2d594c13 100644 --- a/source/blender/editors/gpencil/gpencil_add_stroke.c +++ b/source/blender/editors/gpencil/gpencil_add_stroke.c @@ -49,7 +49,10 @@ typedef struct ColorTemplate { } ColorTemplate; /* Add color an ensure duplications (matched by name) */ -static int gp_stroke_material(Main *bmain, Object *ob, const ColorTemplate *pct, const bool fill) +static int gpencil_stroke_material(Main *bmain, + Object *ob, + const ColorTemplate *pct, + const bool fill) { short *totcol = BKE_object_material_len_p(ob); Material *ma = NULL; @@ -224,12 +227,12 @@ void ED_gpencil_create_stroke(bContext *C, Object *ob, float mat[4][4]) bGPDstroke *gps; /* create colors */ - int color_black = gp_stroke_material(bmain, ob, &gp_stroke_material_black, false); - gp_stroke_material(bmain, ob, &gp_stroke_material_white, false); - gp_stroke_material(bmain, ob, &gp_stroke_material_red, false); - gp_stroke_material(bmain, ob, &gp_stroke_material_green, false); - gp_stroke_material(bmain, ob, &gp_stroke_material_blue, false); - gp_stroke_material(bmain, ob, &gp_stroke_material_grey, true); + int color_black = gpencil_stroke_material(bmain, ob, &gp_stroke_material_black, false); + gpencil_stroke_material(bmain, ob, &gp_stroke_material_white, false); + gpencil_stroke_material(bmain, ob, &gp_stroke_material_red, false); + gpencil_stroke_material(bmain, ob, &gp_stroke_material_green, false); + gpencil_stroke_material(bmain, ob, &gp_stroke_material_blue, false); + gpencil_stroke_material(bmain, ob, &gp_stroke_material_grey, true); /* set first color as active and in brushes */ ob->actcol = color_black + 1; |