T73589: Code Quality: Renaming on BKE_material.h

Old Name                             New Name
=========                            =========
init_def_material                    BKE_materials_init
BKE_material_gpencil_default_free    BKE_materials_exit
test_object_materials                BKE_object_materials_test
test_all_objects_materials           BKE_objects_materials_test_all
give_matarar                         BKE_object_material_array
give_totcolp                         BKE_object_material_num
give_current_material_p              BKE_object_material_get_p
give_current_material                BKE_object_material_get
assign_material                      BKE_object_material_assign
assign_matarar                       BKE_object_material_array_assign
give_matarar_id                      BKE_id_material_array
give_totcolp_id                      BKE_id_material_num
assign_material_id                   BKE_id_material_assign
clear_matcopybuf                     BKE_material_copybuf_clear
free_matcopybuf                      BKE_material_copybuf_free
copy_matcopybuf                      BKE_material_copybuf_copy
paste_matcopybuf                     BKE_material_copybuf_paste
BKE_material_init_gpencil_settings   BKE_gpencil_material_attr_init
BKE_material_add_gpencil             BKE_gpencil_material_add
BKE_material_gpencil_get             BKE_gpencil_material
BKE_material_gpencil_default_get     BKE_gpencil_material_default
BKE_material_gpencil_settings_get    BKE_gpencil_material_settings

5 files changed, 14 insertions, 14 deletions

diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 49fdf9c67d5..0b4ac400152 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -630,12 +630,12 @@ static int rna_IDPArray_length(PointerRNA *ptr)
 int rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assign_ptr)
 {
   ID *id = ptr->owner_id;
-  short *totcol = give_totcolp_id(id);
+  short *totcol = BKE_id_material_num(id);
   Material *mat_id = (Material *)assign_ptr->owner_id;
   if (totcol && (key >= 0 && key < *totcol)) {
     BLI_assert(BKE_id_is_in_global_main(id));
     BLI_assert(BKE_id_is_in_global_main(&mat_id->id));
-    assign_material_id(G_MAIN, id, mat_id, key + 1);
+    BKE_id_material_assign(G_MAIN, id, mat_id, key + 1);
     return 1;
   }
   else {
@@ -654,7 +654,7 @@ static void rna_IDMaterials_append_id(ID *id, Main *bmain, Material *ma)
 static Material *rna_IDMaterials_pop_id(ID *id, Main *bmain, ReportList *reports, int index_i)
 {
   Material *ma;
-  short *totcol = give_totcolp_id(id);
+  short *totcol = BKE_id_material_num(id);
   const short totcol_orig = *totcol;
   if (index_i < 0) {
     index_i += (*totcol);
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index b0ee5da82b3..edbaa13f80c 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -778,7 +778,7 @@ static void rna_BrushGpencilSettings_use_material_pin_update(bContext *C, Pointe
   Brush *brush = (Brush *)ptr->owner_id;
 
   if (brush->gpencil_settings->flag & GP_BRUSH_MATERIAL_PINNED) {
-    Material *material = give_current_material(ob, ob->actcol);
+    Material *material = BKE_object_material_get(ob, ob->actcol);
     BKE_gpencil_brush_material_set(brush, material);
   }
   else {
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 9df21a16e90..31e696534fe 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -270,7 +270,7 @@ static Object *rna_Main_objects_new(Main *bmain, ReportList *reports, const char
   ob = BKE_object_add_only_object(bmain, type, safe_name);
 
   ob->data = data;
-  test_object_materials(bmain, ob, ob->data);
+  BKE_object_materials_test(bmain, ob, ob->data);
 
   return ob;
 }
@@ -289,7 +289,7 @@ static void rna_Main_materials_gpencil_data(Main *UNUSED(bmain), PointerRNA *id_
 {
   ID *id = id_ptr->data;
   Material *ma = (Material *)id;
-  BKE_material_init_gpencil_settings(ma);
+  BKE_gpencil_material_attr_init(ma);
 }
 
 static void rna_Main_materials_gpencil_remove(Main *UNUSED(bmain), PointerRNA *id_ptr)
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 70192198e14..64aca3ca442 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -489,7 +489,7 @@ static void rna_Object_data_set(PointerRNA *ptr, PointerRNA value, struct Report
     id_us_plus(id);
 
     ob->data = id;
-    test_object_materials(G_MAIN, ob, id);
+    BKE_object_materials_test(G_MAIN, ob, id);
 
     if (GS(id->name) == ID_CU) {
       BKE_curve_type_test(ob);
@@ -956,7 +956,7 @@ static PointerRNA rna_Object_active_material_get(PointerRNA *ptr)
   Object *ob = (Object *)ptr->owner_id;
   Material *ma;
 
-  ma = (ob->totcol) ? give_current_material(ob, ob->actcol) : NULL;
+  ma = (ob->totcol) ? BKE_object_material_get(ob, ob->actcol) : NULL;
   return rna_pointer_inherit_refine(ptr, &RNA_Material, ma);
 }
 
@@ -969,7 +969,7 @@ static void rna_Object_active_material_set(PointerRNA *ptr,
   DEG_id_tag_update(value.data, 0);
   BLI_assert(BKE_id_is_in_global_main(&ob->id));
   BLI_assert(BKE_id_is_in_global_main(value.data));
-  assign_material(G_MAIN, ob, value.data, ob->actcol, BKE_MAT_ASSIGN_EXISTING);
+  BKE_object_material_assign(G_MAIN, ob, value.data, ob->actcol, BKE_MAT_ASSIGN_EXISTING);
 
   if (ob && ob->type == OB_GPENCIL) {
     /* notifying material property in topbar */
@@ -1173,7 +1173,7 @@ static PointerRNA rna_MaterialSlot_material_get(PointerRNA *ptr)
   Material *ma;
   const int index = (Material **)ptr->data - ob->mat;
 
-  ma = give_current_material(ob, index + 1);
+  ma = BKE_object_material_get(ob, index + 1);
   return rna_pointer_inherit_refine(ptr, &RNA_Material, ma);
 }
 
@@ -1186,7 +1186,7 @@ static void rna_MaterialSlot_material_set(PointerRNA *ptr,
 
   BLI_assert(BKE_id_is_in_global_main(&ob->id));
   BLI_assert(BKE_id_is_in_global_main(value.data));
-  assign_material(G_MAIN, ob, value.data, index + 1, BKE_MAT_ASSIGN_EXISTING);
+  BKE_object_material_assign(G_MAIN, ob, value.data, index + 1, BKE_MAT_ASSIGN_EXISTING);
 }
 
 static bool rna_MaterialSlot_material_poll(PointerRNA *ptr, PointerRNA value)
@@ -1233,7 +1233,7 @@ static int rna_MaterialSlot_name_length(PointerRNA *ptr)
   Material *ma;
   int index = (Material **)ptr->data - ob->mat;
 
-  ma = give_current_material(ob, index + 1);
+  ma = BKE_object_material_get(ob, index + 1);
 
   if (ma) {
     return strlen(ma->id.name + 2);
@@ -1248,7 +1248,7 @@ static void rna_MaterialSlot_name_get(PointerRNA *ptr, char *str)
   Material *ma;
   int index = (Material **)ptr->data - ob->mat;
 
-  ma = give_current_material(ob, index + 1);
+  ma = BKE_object_material_get(ob, index + 1);
 
   if (ma) {
     strcpy(str, ma->id.name + 2);
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 29ec968fe2a..d779ae9178c 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -425,7 +425,7 @@ static const EnumPropertyItem *rna_Particle_Material_itemf(bContext *C,
 
   if (ob && ob->totcol > 0) {
     for (i = 1; i <= ob->totcol; i++) {
-      ma = give_current_material(ob, i);
+      ma = BKE_object_material_get(ob, i);
       tmp.value = i;
       tmp.icon = ICON_MATERIAL_DATA;
       if (ma) {