diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-09 10:22:46 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-09 11:09:13 +0300 |
| commit | f55026d46861a3cb0108ad3f7bab8ed0610f660d (patch) | |
| tree | 5eef1d0cb4400250eec037f92b8e1147adad96eb /source/blender/editors/gpencil/gpencil_paint.c | |
| parent | eb9237eb20ccec08bce364db5f768b854a5bb440 (diff) | |
Cleanup: BKE_gpencil naming
- The ambiguous term 'handle' was used where 'ensure'
is typically used (get or add when missing).
- Rename `current` to `active`, all `current` functions which were
also ensuring.
- Clarify what is being operated on, using `BKE_gpencil_object_*` for
objects, `BKE_gpencil_brush_*` for brushes.
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_paint.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index d544bd8f9b6..daea24ecaa3 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1223,7 +1223,7 @@ static void gp_stroke_newfrombuffer(tGPsdata *p) } /* Save material index */ - gps->mat_nr = BKE_gpencil_get_material_index_for_brush(p->ob, p->brush); + gps->mat_nr = BKE_gpencil_object_material_get_index_from_brush(p->ob, p->brush); /* calculate UVs along the stroke */ ED_gpencil_calc_stroke_uv(obact, gps); @@ -1832,7 +1832,7 @@ static void gp_init_colors(tGPsdata *p) MaterialGPencilStyle *gp_style = NULL; /* use brush material */ - p->material = BKE_gpencil_current_input_brush_material(p->bmain, p->ob, brush); + p->material = BKE_gpencil_object_material_ensure_from_active_input_brush(p->bmain, p->ob, brush); /* assign color information to temp tGPsdata */ gp_style = p->material->gp_style; |