From ce6d1e890c7b829c59d1af3b22a18238d51f0735 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 22 Nov 2018 16:35:12 +0100 Subject: Cleanup: Use proper module prefix in function names --- source/blender/blenkernel/BKE_armature.h | 8 ++++---- source/blender/blenkernel/intern/armature.c | 20 ++++++++++---------- source/blender/blenkernel/intern/armature_update.c | 6 +++--- source/blender/blenkernel/intern/object.c | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h index 8ae29aee65c..be8bd9557e5 100644 --- a/source/blender/blenkernel/BKE_armature.h +++ b/source/blender/blenkernel/BKE_armature.h @@ -280,11 +280,11 @@ void BKE_pose_eval_proxy_copy_bone( * used by armature_deform_verts(). */ struct ObjectBBoneDeform; -struct ObjectBBoneDeform * armature_cached_bbone_deformation_get( +struct ObjectBBoneDeform * BKE_armature_cached_bbone_deformation_get( struct Object *object); -void armature_cached_bbone_deformation_free_data(struct Object *object); -void armature_cached_bbone_deformation_free(struct Object *object); -void armature_cached_bbone_deformation_update(struct Object *object); +void BKE_armature_cached_bbone_deformation_free_data(struct Object *object); +void BKE_armature_cached_bbone_deformation_free(struct Object *object); +void BKE_armature_cached_bbone_deformation_update(struct Object *object); #ifdef __cplusplus } diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 8d526fec43b..a5a2e1d5645 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1109,7 +1109,7 @@ void armature_deform_verts( * TODO(sergey): Make this code robust somehow when there are dependency * cycles involved. */ ObjectBBoneDeform * bbone_deform = - armature_cached_bbone_deformation_get(armOb); + BKE_armature_cached_bbone_deformation_get(armOb); if (bbone_deform == NULL || bbone_deform->pdef_info_array == NULL) { fprintf(stderr, "Armature does not have bbone cache %s, " @@ -2486,15 +2486,15 @@ bPoseChannel *BKE_armature_splineik_solver_find_root( /* ****************************** BBone cache ****************************** */ -ObjectBBoneDeform * armature_cached_bbone_deformation_get(Object *object) +ObjectBBoneDeform * BKE_armature_cached_bbone_deformation_get(Object *object) { return object->runtime.cached_bbone_deformation; } -void armature_cached_bbone_deformation_free_data(Object *object) +void BKE_armature_cached_bbone_deformation_free_data(Object *object) { ObjectBBoneDeform *bbone_deform = - armature_cached_bbone_deformation_get(object); + BKE_armature_cached_bbone_deformation_get(object); if (bbone_deform == NULL) { return; } @@ -2516,19 +2516,19 @@ void armature_cached_bbone_deformation_free_data(Object *object) bbone_deform->num_pchan = 0; } -void armature_cached_bbone_deformation_free(Object *object) +void BKE_armature_cached_bbone_deformation_free(Object *object) { ObjectBBoneDeform *bbone_deform = - armature_cached_bbone_deformation_get(object); + BKE_armature_cached_bbone_deformation_get(object); if (bbone_deform == NULL) { return; } - armature_cached_bbone_deformation_free_data(object); + BKE_armature_cached_bbone_deformation_free_data(object); MEM_freeN(bbone_deform); object->runtime.cached_bbone_deformation = NULL; } -void armature_cached_bbone_deformation_update(Object *object) +void BKE_armature_cached_bbone_deformation_update(Object *object) { BLI_assert(object->type == OB_ARMATURE); BLI_assert(object->pose != NULL); @@ -2537,13 +2537,13 @@ void armature_cached_bbone_deformation_update(Object *object) const bool use_quaternion = true; /* Make sure cache exists. */ ObjectBBoneDeform *bbone_deform = - armature_cached_bbone_deformation_get(object); + BKE_armature_cached_bbone_deformation_get(object); if (bbone_deform == NULL) { bbone_deform = MEM_callocN(sizeof(*bbone_deform), "bbone deform cache"); object->runtime.cached_bbone_deformation = bbone_deform; } /* Make sure arrays are allocateds at the proper size. */ - armature_cached_bbone_deformation_free_data(object); + BKE_armature_cached_bbone_deformation_free_data(object); DualQuat *dualquats = NULL; if (use_quaternion) { dualquats = MEM_calloc_arrayN( diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c index 01f1a3f7b55..0fba7677479 100644 --- a/source/blender/blenkernel/intern/armature_update.c +++ b/source/blender/blenkernel/intern/armature_update.c @@ -608,7 +608,7 @@ void BKE_pose_eval_init(struct Depsgraph *depsgraph, } pose_pchan_index_create(pose); - armature_cached_bbone_deformation_free_data(object); + BKE_armature_cached_bbone_deformation_free_data(object); } void BKE_pose_eval_init_ik(struct Depsgraph *depsgraph, @@ -754,7 +754,7 @@ static void pose_eval_done_common(struct Depsgraph *depsgraph, Object *object) bPose *pose = object->pose; UNUSED_VARS_NDEBUG(pose); BLI_assert(pose != NULL); - armature_cached_bbone_deformation_update(object); + BKE_armature_cached_bbone_deformation_update(object); BKE_object_eval_boundbox(depsgraph, object); } static void pose_eval_cleanup_common(Object *object) @@ -796,7 +796,7 @@ void BKE_pose_eval_proxy_init(struct Depsgraph *depsgraph, Object *object) DEG_debug_print_eval(depsgraph, __func__, object->id.name, object); pose_pchan_index_create(object->pose); - armature_cached_bbone_deformation_free_data(object); + BKE_armature_cached_bbone_deformation_free_data(object); } void BKE_pose_eval_proxy_done(struct Depsgraph *depsgraph, Object *object) diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 0d3dfbeb382..95e51481d9a 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -458,7 +458,7 @@ void BKE_object_free_derived_caches(Object *ob) object_update_from_subsurf_ccg(ob); BKE_object_free_derived_mesh_caches(ob); - armature_cached_bbone_deformation_free(ob); + BKE_armature_cached_bbone_deformation_free(ob); if (ob->runtime.mesh_eval != NULL) { Mesh *mesh_eval = ob->runtime.mesh_eval; -- cgit v1.2.3