Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-03-23 05:57:13 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-03-23 05:58:09 +0300
commit38b7563a4fbb0f06775e980b7439c0354dc78641 (patch)
treea7c8455b238c599106816d657e81638e51fd00cf /source/blender/blenkernel/BKE_gpencil.h
parenta7239c2bad8fa9cd3896d6c845d2ddc4d9b27946 (diff)
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`
Diffstat (limited to 'source/blender/blenkernel/BKE_gpencil.h')
-rw-r--r--source/blender/blenkernel/BKE_gpencil.h6
1 files changed, 5 insertions, 1 deletions
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);