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:
authorAntonio Vazquez <blendergit@gmail.com>2020-02-05 13:23:58 +0300
committerAntonio Vazquez <blendergit@gmail.com>2020-02-05 17:56:50 +0300
commit1bc2a98a9d609e54c928672f148edfba9d5f8c5a (patch)
tree0884042019d5c886348e643d30744b4bdcf5a60f /source/blender/editors/mesh
parent06c560864607562acdc1e61b13369f24b22c102c (diff)
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
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r--source/blender/editors/mesh/editmesh_select_similar.c4
-rw-r--r--source/blender/editors/mesh/editmesh_tools.c8
-rw-r--r--source/blender/editors/mesh/meshtools.c8
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c
index cee048b9513..e7ee36387d2 100644
--- a/source/blender/editors/mesh/editmesh_select_similar.c
+++ b/source/blender/editors/mesh/editmesh_select_similar.c
@@ -229,7 +229,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
if (ob->totcol == 0) {
continue;
}
- material_array = give_matarar(ob);
+ material_array = BKE_object_material_array(ob);
break;
}
case SIMFACE_FREESTYLE: {
@@ -353,7 +353,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
if (ob->totcol == 0) {
continue;
}
- material_array = give_matarar(ob);
+ material_array = BKE_object_material_array(ob);
break;
}
case SIMFACE_FREESTYLE: {
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 0fea21710e9..0c564bb7593 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -3935,7 +3935,7 @@ static Base *mesh_separate_tagged(
/* DAG_relations_tag_update(bmain); */
/* new in 2.5 */
- assign_matarar(bmain, base_new->object, give_matarar(obedit), *give_totcolp(obedit));
+ BKE_object_material_array_assign(bmain, base_new->object, BKE_object_material_array(obedit), *BKE_object_material_num(obedit));
ED_object_base_select(base_new, BA_SELECT);
@@ -4002,7 +4002,7 @@ static Base *mesh_separate_arrays(Main *bmain,
/* DAG_relations_tag_update(bmain); */
/* new in 2.5 */
- assign_matarar(bmain, base_new->object, give_matarar(obedit), *give_totcolp(obedit));
+ BKE_object_material_array_assign(bmain, base_new->object, BKE_object_material_array(obedit), *BKE_object_material_num(obedit));
ED_object_base_select(base_new, BA_SELECT);
@@ -4046,8 +4046,8 @@ static void mesh_separate_material_assign_mat_nr(Main *bmain, Object *ob, const
Material ***matarar;
const short *totcolp;
- totcolp = give_totcolp_id(obdata);
- matarar = give_matarar_id(obdata);
+ totcolp = BKE_id_material_num(obdata);
+ matarar = BKE_id_material_array(obdata);
if ((totcolp && matarar) == 0) {
BLI_assert(0);
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 380d9100ed4..fa282612a8e 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -250,7 +250,7 @@ static void join_mesh_single(Depsgraph *depsgraph,
if (matmap) {
/* make mapping for materials */
for (a = 1; a <= ob_src->totcol; a++) {
- Material *ma = give_current_material(ob_src, a);
+ Material *ma = BKE_object_material_get(ob_src, a);
for (b = 0; b < totcol; b++) {
if (ma == matar[b]) {
@@ -391,7 +391,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
/* obact materials in new main array, is nicer start! */
for (a = 0; a < ob->totcol; a++) {
- matar[a] = give_current_material(ob, a + 1);
+ matar[a] = BKE_object_material_get(ob, a + 1);
id_us_plus((ID *)matar[a]);
/* increase id->us : will be lowered later */
}
@@ -457,7 +457,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
* (but only if limits not exceeded yet) */
if (totcol < MAXMAT) {
for (a = 1; a <= ob_iter->totcol; a++) {
- ma = give_current_material(ob_iter, a);
+ ma = BKE_object_material_get(ob_iter, a);
for (b = 0; b < totcol; b++) {
if (ma == matar[b]) {
@@ -669,7 +669,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
ob->totcol = me->totcol = totcol;
/* other mesh users */
- test_all_objects_materials(bmain, (ID *)me);
+ BKE_objects_materials_test_all(bmain, (ID *)me);
/* free temp copy of destination shapekeys (if applicable) */
if (nkey) {