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/depsgraph
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/depsgraph')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_nodes.cc4
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 4f70e8b0806..1cef9e357e4 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -717,9 +717,9 @@ void DepsgraphNodeBuilder::build_object_data(Object *object, bool is_object_visi
}
}
/* Materials. */
- Material ***materials_ptr = BKE_object_material_array(object);
+ Material ***materials_ptr = BKE_object_material_array_p(object);
if (materials_ptr != nullptr) {
- short *num_materials_ptr = BKE_object_material_num(object);
+ short *num_materials_ptr = BKE_object_material_len_p(object);
build_materials(*materials_ptr, *num_materials_ptr);
}
}
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 3e7fb702d6a..de8c4a291b5 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -814,9 +814,9 @@ void DepsgraphRelationBuilder::build_object_data(Object *object)
build_nested_shapekey(&object->id, key);
}
/* Materials. */
- Material ***materials_ptr = BKE_object_material_array(object);
+ Material ***materials_ptr = BKE_object_material_array_p(object);
if (materials_ptr != nullptr) {
- short *num_materials_ptr = BKE_object_material_num(object);
+ short *num_materials_ptr = BKE_object_material_len_p(object);
build_materials(*materials_ptr, *num_materials_ptr);
}
}