[Bf-blender-cvs] [2fb4de1f8c1] master: Cleanup: material API naming
Campbell Barton
noreply at git.blender.org
Wed Mar 4 22:25:40 CET 2020
Commit: 2fb4de1f8c1b3117da47aff39972d92cc078dd29
Author: Campbell Barton
Date: Thu Mar 5 08:08:23 2020 +1100
Branches: master
https://developer.blender.org/rB2fb4de1f8c1b3117da47aff39972d92cc078dd29
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
===================================================================
M source/blender/blenkernel/BKE_material.h
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenloader/intern/readfile.c
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/editors/gpencil/gpencil_add_monkey.c
M source/blender/editors/gpencil/gpencil_add_stroke.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/interface/interface_eyedropper_gpencil_color.c
M source/blender/editors/mesh/editmesh_select_similar.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/render/render_shading.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/modifiers/intern/MOD_boolean.c
===================================================================
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]);
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 5713a93d740..2a84184cfe7 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -2368,7 +2368,7 @@ void BKE_gpencil_stats_update(bGPdata *gpd)
/* get material index (0-based like mat_nr not actcol) */
int BKE_gpencil_object_material_get_index(Object *ob, Material *ma)
{
- short *totcol = BKE_object_material_num(ob);
+ short *totcol = BKE_object_material_len_p(ob);
Material *read_ma = NULL;
for (short i = 0; i < *totcol; i++) {
read_ma = BKE_object_material_get(ob, i + 1);
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index af09b4a2db8..f8e1e9aeef2 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -235,7 +235,7 @@ void BKE_material_make_local(Main *bmain, Material *ma, const int flags)
BKE_lib_id_make_local_generic(bmain, &ma->id, flags);
}
-Material ***BKE_object_material_array(Object *ob)
+Material ***BKE_object_material_array_p(Object *ob)
{
Mesh *me;
Curve *cu;
@@ -261,7 +261,7 @@ Material ***BKE_object_material_array(Object *ob)
return NULL;
}
-short *BKE_object_material_num(Object *ob)
+short *BKE_object_material_len_p(Object *ob)
{
Mesh *me;
Curve *cu;
@@ -288,7 +288,7 @@ short *BKE_object_material_num(Object *ob)
}
/* same as above but for ID's */
-Material ***BKE_id_material_array(ID *id)
+Material ***BKE_id_material_array_p(ID *id)
{
/* ensure we don't try get materials from non-obdata */
BLI_assert(OB_DATA_SUPPORT_ID(GS(id->name)));
@@ -308,7 +308,7 @@ Material ***BKE_id_material_array(ID *id)
return NULL;
}
-short *BKE_id_material_num(ID *id)
+short *BKE_id_material_len_p(ID *id)
{
/* ensure we don't try get materials from non-obdata */
BLI_assert(OB_DATA_SUPPORT_ID(GS(id->name)));
@@ -388,10 +388,10 @@ static void material_data_index_clear_id(ID *id)
}
}
-void BKE_material_resize_id(Main *bmain, ID *id, short totcol, bool do_id_user)
+void BKE_id_material_resize(Main *bmain, ID *id, short totcol, bool do_id_user)
{
- Material ***matar = BKE_id_material_array(id);
- short *totcolp = BKE_id_material_num(id);
+ Material ***matar = BKE_id_material_array_p(id);
+ short *totcolp = BKE_id_material_len_p(id);
if (matar == NULL) {
return;
@@ -419,11 +419,11 @@ void BKE_material_resize_id(Main *bmain, ID *id, short totcol, bool do_id_user)
DEG_relations_tag_update(bmain);
}
-void BKE_material_append_id(Main *bmain, ID *id, Material *ma)
+void BKE_id_material_append(Main *bmain, ID *id, Material *ma)
{
Material ***matar;
- if ((matar = BKE_id_material_array(id))) {
- short *totcol = BKE_id_material_num(id);
+ if ((matar = BKE_id_material_array_p(id))) {
+ short *totcol = BKE_id_material_len_p(id);
Material **mat = MEM_callocN(sizeof(void *) * ((*totcol) + 1), "newmatar");
if (*totcol) {
memcpy(mat, *matar, sizeof(void *) * (*totcol));
@@ -443,13 +443,13 @@ void BKE_material_append_id(Main *bmain, ID *id, Material *ma)
}
}
-Material *BKE_material_pop_id(Main *bmain, ID *id, int index_i)
+Material *BKE_id_material_pop(Main *bmain, ID *id, int index_i)
{
short index = (short)index_i;
Material *ret = NULL;
Material ***matar;
- if ((matar = BKE_id_material_array(id))) {
- short *totcol = BKE_id_material_num(id);
+ if ((matar = BKE_id_material_array_p(id))) {
+ short *totcol = BKE_id_material_len_p(id);
if (index >= 0 && index < (*totcol)) {
ret = (*matar)[index];
id_us_min((ID *)ret);
@@ -481,11 +481,11 @@ Material *BKE_material_pop_id(Main *bmain, ID *id, int index_i)
return ret;
}
-void BKE_material_clear_id(Main *bmain, ID *id)
+void BKE_id_material_clear(Main *bmain, ID *id)
{
Material ***matar;
- if ((matar = BKE_id_material_array(id))) {
- short *totcol = BKE_id_material_num(id);
+ if ((matar = BKE_id_material_array_p(id))) {
+ short *totcol = BKE_id_material_len_p(id);
while ((*totcol)--) {
id_us_min((ID *)((*matar)[*totcol]));
@@ -514,7 +514,7 @@ Material **BKE_object_material_get_p(Object *ob, short act)
}
/* if object cannot have material, (totcolp == NULL) */
- totcolp = BKE_object_material_num(ob);
+ totcolp = BKE_object_material_len_p(ob);
if (totcolp == NULL || ob->totcol == 0) {
return NULL;
}
@@ -543,7 +543,7 @@ Material **BKE_object_material_get_p(Object *ob, short act)
act = ob->totcol;
}
- matarar = BKE_object_material_array(ob);
+ matarar = BKE_object_material_array_p(ob);
if (matarar && *matarar) {
ma_p = &(*matarar)[act - 1];
@@ -588,7 +588,7 @@ MaterialGPencilStyle *BKE_gpencil_material_settings(Object *ob, short act)
}
}
-void BKE_material_resize_object(Main *bmain, Object *ob, const short totcol, bool do_id_user)
+void BKE_object_material_resize(Main *bmain, Object *ob, const short totcol, bool do_id_user)
{
Material **newmatar;
char *newmatbits;
@@ -639,11 +639,11 @@ void BKE_object_materials_test(Main *bmain, Object *ob, ID *id)
/* make the ob mat-array same size as 'ob->data' mat-array */
const short *totcol;
- if (id == NULL || (totcol = BKE_id_material_num(id)) == NULL) {
+ if (id == NULL || (totcol = BKE_id_material_len_p(id)) == NULL) {
return;
}
- BKE_material_resize_object(bmain, ob, *totcol, false);
+ BKE_object_material_resize(bmain, ob, *totcol, false);
}
void BKE_objects_materials_test_all(Main *bmain, ID *id)
@@ -652,14 +652,14 @@ void BKE_objects_materials_test_all(Main *bmain, ID *id)
Object *ob;
const short *totcol;
- if (id == NULL || (totcol = BKE_id_material_num(id)) == NULL) {
+ if (id == NULL || (totcol = BKE_id_material_len_p(id)) == NULL) {
return;
}
BKE_main_lock(bmain);
for (ob = bmain->objects.first; ob; ob = ob->id.next) {
if (ob->data == id) {
- BKE_material_resize_object(bmain, ob, *totcol, false);
+ BKE_object_material_resize(bmain, ob, *totcol, false);
}
}
BKE_main_unlock(bmain);
@@ -679,8 +679,8 @@ void BKE_id_material_assign(Main *bmain, ID *id, Material *ma, short act)
/* test arraylens */
- totcolp = BKE_id_material_num(id);
- matarar = BKE_id_material_array(id);
+ totcolp = BKE_id_material_len_p(id);
+ matarar = BKE_id_material_array_p(id);
if (totcolp == NULL || matarar == NULL) {
return;
@@ -733,8 +733,8 @@ void BKE_object_material_assign(Main *bmain, Object *ob, Material *ma, short act
/* test arraylens */
- totcolp = BKE_object_material_num(ob);
- matarar = BKE_object_material_array(ob);
+ totcolp = BKE_object_material_len_p(ob);
+ matarar = BKE_object_material_array_p(ob);
if (totcolp == NULL || matarar == NULL) {
return;
@@ -809,10 +809,10 @@ void BKE_object_material_assign(Main *bmain, Object *ob, Material *ma, short act
}
}
-void BKE_material_remap_object(Object *ob, const unsigned int *remap)
+void BKE_object_material_remap(Object *ob, const unsigned int *remap)
{
- Material ***matar = BKE_object_material_array(ob);
- const short *totcol_p = BKE_object_material_num(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list