diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-02-05 13:23:58 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-02-05 17:56:50 +0300 |
| commit | 1bc2a98a9d609e54c928672f148edfba9d5f8c5a (patch) | |
| tree | 0884042019d5c886348e643d30744b4bdcf5a60f /source/blender/editors/animation | |
| parent | 06c560864607562acdc1e61b13369f24b22c102c (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/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/animation/keyframing.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 4c81df8b71d..b3a9353bb74 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -2296,7 +2296,7 @@ static size_t animdata_filter_ds_materials( /* First pass: take the materials referenced via the Material slots of the object. */ for (a = 1; a <= ob->totcol; a++) { - Material *ma = give_current_material(ob, a); + Material *ma = BKE_object_material_get(ob, a); /* if material is valid, try to add relevant contents from here */ if (ma) { @@ -2319,7 +2319,7 @@ static size_t animdata_filter_ds_materials( */ if (has_nested) { for (a = 1; a <= ob->totcol; a++) { - Material *base = give_current_material(ob, a); + Material *base = BKE_object_material_get(ob, a); Material *ma = give_node_material(base); /* add channels from the nested material if it exists diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 14b1f6523d9..188192e10ae 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -2848,7 +2848,7 @@ static bool object_frame_has_keyframe(Object *ob, float frame, short filter) if (!(filter & ANIMFILTER_KEYS_LOCAL) && !(filter & ANIMFILTER_KEYS_NOMAT)) { /* if only active, then we can skip a lot of looping */ if (filter & ANIMFILTER_KEYS_ACTIVE) { - Material *ma = give_current_material(ob, (ob->actcol + 1)); + Material *ma = BKE_object_material_get(ob, (ob->actcol + 1)); /* we only retrieve the active material... */ if (id_frame_has_keyframe((ID *)ma, frame, filter)) { @@ -2860,7 +2860,7 @@ static bool object_frame_has_keyframe(Object *ob, float frame, short filter) /* loop over materials */ for (a = 0; a < ob->totcol; a++) { - Material *ma = give_current_material(ob, a + 1); + Material *ma = BKE_object_material_get(ob, a + 1); if (id_frame_has_keyframe((ID *)ma, frame, filter)) { return true; |