diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-05 00:08:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-05 00:21:31 +0300 |
commit | 2fb4de1f8c1b3117da47aff39972d92cc078dd29 (patch) | |
tree | 9cfb65f92f1d0f6150130643fb1f9d50fc84b9e3 /source/blender/blenkernel/BKE_material.h | |
parent | 5b0f1e7649acca541559ef2536b15d1525422571 (diff) |
Cleanup: material API naming
- Use 'BKE_object_material_*', 'BKE_id_material_*' prefix
for functions that operate on Object and ID types.
- Use '_len' suffix for length (matching BLI naming).
- Use '_p' suffix for functions that return a pointer to values
where the value would typically be returned.
Functions renamed:
- BKE_object_material_resize was BKE_material_resize_object
- BKE_object_material_remap was BKE_material_remap_object
- BKE_object_material_remap_calc was BKE_material_remap_object_calc
- BKE_object_material_array_p was BKE_object_material_array
- BKE_object_material_len_p was BKE_object_material_num
- BKE_id_material_array_p was BKE_id_material_array
- BKE_id_material_len_p was BKE_id_material_num
- BKE_id_material_resize was BKE_material_resize_id
- BKE_id_material_append was BKE_material_append_id
- BKE_id_material_pop was BKE_material_pop_id
- BKE_id_material_clear was BKE_material_clear_id
Diffstat (limited to 'source/blender/blenkernel/BKE_material.h')
-rw-r--r-- | source/blender/blenkernel/BKE_material.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 6eba59ffe8c..03f556ab500 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -45,13 +45,13 @@ void BKE_materials_exit(void); void BKE_material_free(struct Material *ma); void BKE_object_materials_test(struct Main *bmain, struct Object *ob, struct ID *id); void BKE_objects_materials_test_all(struct Main *bmain, struct ID *id); -void BKE_material_resize_object(struct Main *bmain, +void BKE_object_material_resize(struct Main *bmain, struct Object *ob, const short totcol, bool do_id_user); void BKE_material_init(struct Material *ma); -void BKE_material_remap_object(struct Object *ob, const unsigned int *remap); -void BKE_material_remap_object_calc(struct Object *ob_dst, +void BKE_object_material_remap(struct Object *ob, const unsigned int *remap); +void BKE_object_material_remap_calc(struct Object *ob_dst, struct Object *ob_src, short *remap_src_to_dst); struct Material *BKE_material_add(struct Main *bmain, const char *name); @@ -70,10 +70,10 @@ void BKE_gpencil_material_attr_init(struct Material *ma); /* material slots */ -struct Material ***BKE_object_material_array(struct Object *ob); -short *BKE_object_material_num(struct Object *ob); -struct Material ***BKE_id_material_array(struct ID *id); /* same but for ID's */ -short *BKE_id_material_num(struct ID *id); +struct Material ***BKE_object_material_array_p(struct Object *ob); +short *BKE_object_material_len_p(struct Object *ob); +struct Material ***BKE_id_material_array_p(struct ID *id); /* same but for ID's */ +short *BKE_id_material_len_p(struct ID *id); enum { /* use existing link option */ @@ -106,13 +106,13 @@ void BKE_texpaint_slots_refresh_object(struct Scene *scene, struct Object *ob); struct bNode *BKE_texpaint_slot_material_find_node(struct Material *ma, short texpaint_slot); /* rna api */ -void BKE_material_resize_id(struct Main *bmain, struct ID *id, short totcol, bool do_id_user); -void BKE_material_append_id(struct Main *bmain, struct ID *id, struct Material *ma); -struct Material *BKE_material_pop_id(struct Main *bmain, +void BKE_id_material_resize(struct Main *bmain, struct ID *id, short totcol, bool do_id_user); +void BKE_id_material_append(struct Main *bmain, struct ID *id, struct Material *ma); +struct Material *BKE_id_material_pop(struct Main *bmain, struct ID *id, /* index is an int because of RNA. */ int index); -void BKE_material_clear_id(struct Main *bmain, struct ID *id); +void BKE_id_material_clear(struct Main *bmain, struct ID *id); /* rendering */ void ramp_blend(int type, float r_col[3], const float fac, const float col[3]); |