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/draw/engines | |
| 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/draw/engines')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_draw_utils.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_engine.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c index 475a083ac97..6aefd2a69c5 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c @@ -1355,7 +1355,7 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T float obscale = mat4_to_scale(ob->obmat); /* use the brush material */ - Material *ma = BKE_gpencil_get_material_for_brush(ob, brush); + Material *ma = BKE_gpencil_object_material_get_from_brush(ob, brush); if (ma != NULL) { gp_style = ma->gp_style; } diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 1defef334df..56ef4b97dcf 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -316,7 +316,7 @@ void GPENCIL_cache_init(void *vedata) if (obact && (obact->type == OB_GPENCIL) && (obact->data)) { obact_gpd = (bGPdata *)obact->data; /* use the brush material */ - Material *ma = BKE_gpencil_get_material_for_brush(obact, brush); + Material *ma = BKE_gpencil_object_material_get_from_brush(obact, brush); if (ma != NULL) { gp_style = ma->gp_style; } |