From 38b7563a4fbb0f06775e980b7439c0354dc78641 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 23 Mar 2021 13:57:13 +1100 Subject: Cleanup: de-duplicate gpencil logic to ensure materials - Rename: `BKE_gpencil_object_material_get_index_name`, to `BKE_gpencil_object_material_index_get_by_name` Matching `BKE_gpencil_layer_get_by_name`. - Move logic to ensure named materials into a new function: `BKE_gpencil_object_material_ensure_by_name` --- source/blender/blenkernel/BKE_gpencil.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/BKE_gpencil.h') diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h index a0a3f30d6d8..4b4886e8bf3 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -228,6 +228,10 @@ struct Material *BKE_gpencil_object_material_ensure_from_brush(struct Main *bmai int BKE_gpencil_object_material_ensure(struct Main *bmain, struct Object *ob, struct Material *material); +struct Material *BKE_gpencil_object_material_ensure_by_name(struct Main *bmain, + struct Object *ob, + const char *name, + int *r_index); struct Material *BKE_gpencil_object_material_new(struct Main *bmain, struct Object *ob, @@ -235,7 +239,7 @@ struct Material *BKE_gpencil_object_material_new(struct Main *bmain, int *r_index); int BKE_gpencil_object_material_index_get(struct Object *ob, struct Material *ma); -int BKE_gpencil_object_material_get_index_name(struct Object *ob, char *name); +int BKE_gpencil_object_material_index_get_by_name(struct Object *ob, const char *name); struct Material *BKE_gpencil_object_material_from_brush_get(struct Object *ob, struct Brush *brush); -- cgit v1.2.3