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>2020-03-05 00:08:23 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-03-05 00:21:31 +0300
commit2fb4de1f8c1b3117da47aff39972d92cc078dd29 (patch)
tree9cfb65f92f1d0f6150130643fb1f9d50fc84b9e3 /source/blender/editors/render/render_shading.c
parent5b0f1e7649acca541559ef2536b15d1525422571 (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/editors/render/render_shading.c')
-rw-r--r--source/blender/editors/render/render_shading.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index 8ecaeefbd5f..94e210b7243 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -466,12 +466,12 @@ static int material_slot_copy_exec(bContext *C, wmOperator *UNUSED(op))
Object *ob = ED_object_context(C);
Material ***matar;
- if (!ob || !(matar = BKE_object_material_array(ob))) {
+ if (!ob || !(matar = BKE_object_material_array_p(ob))) {
return OPERATOR_CANCELLED;
}
CTX_DATA_BEGIN (C, Object *, ob_iter, selected_editable_objects) {
- if (ob != ob_iter && BKE_object_material_array(ob_iter)) {
+ if (ob != ob_iter && BKE_object_material_array_p(ob_iter)) {
if (ob->data != ob_iter->data) {
BKE_object_material_array_assign(bmain, ob_iter, matar, ob->totcol);
}
@@ -538,7 +538,7 @@ static int material_slot_move_exec(bContext *C, wmOperator *op)
slot_remap[index_pair[0]] = index_pair[1];
slot_remap[index_pair[1]] = index_pair[0];
- BKE_material_remap_object(ob, slot_remap);
+ BKE_object_material_remap(ob, slot_remap);
MEM_freeN(slot_remap);