Cleanup: Use proper module prefix in function names
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 22 Nov 2018 15:35:12 +0000 (16:35 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 22 Nov 2018 15:35:12 +0000 (16:35 +0100)
source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/armature_update.c
source/blender/blenkernel/intern/object.c

index 8ae29aee65c44aa23fb809e5cd592d47d2f93920..be8bd9557e5ffb526d1bdc2168051a49afc2d545 100644 (file)
@@ -280,11 +280,11 @@ void BKE_pose_eval_proxy_copy_bone(
  * used by armature_deform_verts().
  */
 struct ObjectBBoneDeform;
  * 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);
         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
 }
 
 #ifdef __cplusplus
 }
index 8d526fec43bb06a64fe9edb9f5851cd82e3edab1..a5a2e1d5645792a9e625c0366f9e1f0d44e5daa1 100644 (file)
@@ -1109,7 +1109,7 @@ void armature_deform_verts(
         * TODO(sergey): Make this code robust somehow when there are dependency
         * cycles involved. */
        ObjectBBoneDeform * bbone_deform =
         * 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, "
        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  ****************************** */
 
 
 /* ****************************** 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;
 }
 
 {
        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 =
 {
        ObjectBBoneDeform *bbone_deform =
-               armature_cached_bbone_deformation_get(object);
+               BKE_armature_cached_bbone_deformation_get(object);
        if (bbone_deform == NULL) {
                return;
        }
        if (bbone_deform == NULL) {
                return;
        }
@@ -2516,19 +2516,19 @@ void armature_cached_bbone_deformation_free_data(Object *object)
        bbone_deform->num_pchan = 0;
 }
 
        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 =
 {
        ObjectBBoneDeform *bbone_deform =
-               armature_cached_bbone_deformation_get(object);
+               BKE_armature_cached_bbone_deformation_get(object);
        if (bbone_deform == NULL) {
                return;
        }
        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;
 }
 
        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);
 {
        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 =
        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. */
        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(
        DualQuat *dualquats = NULL;
        if (use_quaternion) {
                dualquats = MEM_calloc_arrayN(
index 01f1a3f7b55af1e57a52baa74ab7c6cc7de23bae..0fba7677479b33f8af346c3df928d6239e0226af 100644 (file)
@@ -608,7 +608,7 @@ void BKE_pose_eval_init(struct Depsgraph *depsgraph,
        }
 
        pose_pchan_index_create(pose);
        }
 
        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,
 }
 
 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);
        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)
        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);
        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)
 }
 
 void BKE_pose_eval_proxy_done(struct Depsgraph *depsgraph, Object *object)
index 0d3dfbeb3828450a50cb231bf920a432d4930bb9..95e51481d9aca2b816657b87e1a8af2a1b8d2ecc 100644 (file)
@@ -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);
 
        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;
 
        if (ob->runtime.mesh_eval != NULL) {
                Mesh *mesh_eval = ob->runtime.mesh_eval;