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/collada | |
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/collada')
-rw-r--r-- | source/blender/collada/AnimationExporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/BCAnimationCurve.cpp | 4 | ||||
-rw-r--r-- | source/blender/collada/BCAnimationSampler.cpp | 4 | ||||
-rw-r--r-- | source/blender/collada/EffectExporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/GeometryExporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/InstanceWriter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/MaterialExporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/MaterialExporter.h | 2 | ||||
-rw-r--r-- | source/blender/collada/MeshImporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index 9d0d075cade..cd4319e3101 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -356,7 +356,7 @@ void AnimationExporter::export_curve_animation(Object *ob, BCAnimationCurve &cur if (curve.is_of_animation_type(BC_ANIMATION_TYPE_MATERIAL)) { int material_index = curve.get_subindex(); - Material *ma = give_current_material(ob, material_index + 1); + Material *ma = BKE_object_material_get(ob, material_index + 1); if (ma) { collada_target = translate_id(id_name(ma)) + "-effect/common/" + get_collada_sid(curve, axis); diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index b17f647bf14..18ca6ae7a0f 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -1207,7 +1207,7 @@ void AnimationImporter::translate_Animations( } if (animType->material != 0) { - Material *ma = give_current_material(ob, 1); + Material *ma = BKE_object_material_get(ob, 1); if (!ma->adt || !ma->adt->action) { act = verify_adt_action(bmain, (ID *)&ma->id, 1); } diff --git a/source/blender/collada/BCAnimationCurve.cpp b/source/blender/collada/BCAnimationCurve.cpp index f944a77196c..36800d611d2 100644 --- a/source/blender/collada/BCAnimationCurve.cpp +++ b/source/blender/collada/BCAnimationCurve.cpp @@ -69,7 +69,7 @@ void BCAnimationCurve::init_pointer_rna(Object *ob) RNA_id_pointer_create(&ob->id, &id_ptr); } break; case BC_ANIMATION_TYPE_MATERIAL: { - Material *ma = give_current_material(ob, curve_key.get_subindex() + 1); + Material *ma = BKE_object_material_get(ob, curve_key.get_subindex() + 1); RNA_id_pointer_create(&ma->id, &id_ptr); } break; case BC_ANIMATION_TYPE_CAMERA: { @@ -189,7 +189,7 @@ const std::string BCAnimationCurve::get_animation_name(Object *ob) const } break; case BC_ANIMATION_TYPE_MATERIAL: { - Material *ma = give_current_material(ob, this->curve_key.get_subindex() + 1); + Material *ma = BKE_object_material_get(ob, this->curve_key.get_subindex() + 1); name = id_name(ob) + "-" + id_name(ma) + "-material"; } break; diff --git a/source/blender/collada/BCAnimationSampler.cpp b/source/blender/collada/BCAnimationSampler.cpp index 5262d0b3672..f1282e6a347 100644 --- a/source/blender/collada/BCAnimationSampler.cpp +++ b/source/blender/collada/BCAnimationSampler.cpp @@ -428,7 +428,7 @@ void BCAnimationSampler::initialize_keyframes(BCFrameSet &frameset, Object *ob) add_keyframes_from(bc_getSceneLightAction(ob), frameset); for (int a = 0; a < ob->totcol; a++) { - Material *ma = give_current_material(ob, a + 1); + Material *ma = BKE_object_material_get(ob, a + 1); add_keyframes_from(bc_getSceneMaterialAction(ma), frameset); } } @@ -490,7 +490,7 @@ void BCAnimationSampler::initialize_curves(BCAnimationCurveMap &curves, Object * object_type = BC_ANIMATION_TYPE_MATERIAL; for (int a = 0; a < ob->totcol; a++) { /* Export Material parameter animations. */ - Material *ma = give_current_material(ob, a + 1); + Material *ma = BKE_object_material_get(ob, a + 1); if (ma) { action = bc_getSceneMaterialAction(ma); if (action) { diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp index 2d69fae035f..a1174fdff56 100644 --- a/source/blender/collada/EffectExporter.cpp +++ b/source/blender/collada/EffectExporter.cpp @@ -65,7 +65,7 @@ bool EffectsExporter::hasEffects(Scene *sce) FOREACH_SCENE_OBJECT_BEGIN (sce, ob) { int a; for (a = 0; a < ob->totcol; a++) { - Material *ma = give_current_material(ob, a + 1); + Material *ma = BKE_object_material_get(ob, a + 1); // no material, but check all of the slots if (!ma) { diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index a172e2a53e3..1c8123e8384 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -352,7 +352,7 @@ void GeometryExporter::create_mesh_primitive_list(short material_index, return; } - Material *ma = ob->totcol ? give_current_material(ob, material_index + 1) : NULL; + Material *ma = ob->totcol ? BKE_object_material_get(ob, material_index + 1) : NULL; COLLADASW::PrimitivesBase *primitive_list = create_primitive_list(is_triangulated, mSW); /* sets count attribute in <polylist> */ diff --git a/source/blender/collada/InstanceWriter.cpp b/source/blender/collada/InstanceWriter.cpp index 5c4f574c1b7..c9390d23fe7 100644 --- a/source/blender/collada/InstanceWriter.cpp +++ b/source/blender/collada/InstanceWriter.cpp @@ -38,7 +38,7 @@ void InstanceWriter::add_material_bindings(COLLADASW::BindMaterial &bind_materia bool active_uv_only) { for (int a = 0; a < ob->totcol; a++) { - Material *ma = give_current_material(ob, a + 1); + Material *ma = BKE_object_material_get(ob, a + 1); COLLADASW::InstanceMaterialList &iml = bind_material.getInstanceMaterialList(); diff --git a/source/blender/collada/MaterialExporter.cpp b/source/blender/collada/MaterialExporter.cpp index 9b16d44d67f..488d1833e48 100644 --- a/source/blender/collada/MaterialExporter.cpp +++ b/source/blender/collada/MaterialExporter.cpp @@ -49,7 +49,7 @@ bool MaterialsExporter::hasMaterials(Scene *sce) Object *ob = (Object *)node->link; int a; for (a = 0; a < ob->totcol; a++) { - Material *ma = give_current_material(ob, a + 1); + Material *ma = BKE_object_material_get(ob, a + 1); // no material, but check all of the slots if (!ma) { diff --git a/source/blender/collada/MaterialExporter.h b/source/blender/collada/MaterialExporter.h index 36047626ad2..be0d939b68a 100644 --- a/source/blender/collada/MaterialExporter.h +++ b/source/blender/collada/MaterialExporter.h @@ -66,7 +66,7 @@ template<class Functor> class ForEachMaterialFunctor { int a; 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 (!ma) { continue; diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 8ed30a0dc81..c76cb8c80a6 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -1076,7 +1076,7 @@ void MeshImporter::assign_material_to_geom( // Attention! This temporarily assigns material to object on purpose! // See note above. ob->actcol = 0; - assign_material(m_bmain, ob, ma, mat_index + 1, BKE_MAT_ASSIGN_OBJECT); + BKE_object_material_assign(m_bmain, ob, ma, mat_index + 1, BKE_MAT_ASSIGN_OBJECT); MaterialIdPrimitiveArrayMap &mat_prim_map = geom_uid_mat_mapping_map[*geom_uid]; COLLADAFW::MaterialId mat_id = cmaterial.getMaterialId(); diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 63dad6b7ac0..df79d863391 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -943,7 +943,7 @@ bool bc_has_animations(Object *ob) /* Check Material Effect parameter animations. */ for (int a = 0; a < ob->totcol; a++) { - Material *ma = give_current_material(ob, a + 1); + Material *ma = BKE_object_material_get(ob, a + 1); if (!ma) { continue; } |