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_utils.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_utils.c')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 6601bfe9d2f..bb3da77ffac 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -1332,7 +1332,7 @@ void ED_gpencil_add_defaults(bContext *C, Object *ob) } /* ensure a color exists and is assigned to object */ - BKE_gpencil_current_input_toolsettings_material(bmain, ob, ts); + BKE_gpencil_object_material_ensure_from_active_input_toolsettings(bmain, ob, ts); /* ensure multiframe falloff curve */ if (ts->gp_sculpt.cur_falloff == NULL) { @@ -1701,7 +1701,7 @@ static void gp_brush_cursor_draw(bContext *C, int x, int y, void *customdata) } /* get current drawing color */ - ma = BKE_gpencil_get_material_for_brush(ob, brush); + ma = BKE_gpencil_object_material_get_from_brush(ob, brush); if (ma) { gp_style = ma->gp_style; |