diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:29:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:29:54 +0300 |
| commit | 335e1b507b1ad0e7c2bafb2175dac15d3d1add83 (patch) | |
| tree | 587dff5abd734ead55cd9e0f960cbdeb156cae87 /source/blender/blenkernel | |
| parent | c00e1f68e9b81cc4972dabb869d1b6993a3bc767 (diff) | |
Cleanup: BKE b-bone API naming
Use BKE_pchan_bbone prefix.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_armature.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/armature.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h index dea5afa1ac2..efd665b070a 100644 --- a/source/blender/blenkernel/BKE_armature.h +++ b/source/blender/blenkernel/BKE_armature.h @@ -139,7 +139,7 @@ typedef struct Mat4 { } Mat4; void equalize_bbone_bezier(float *data, int desired); -void b_bone_spline_setup(struct bPoseChannel *pchan, int rest, Mat4 result_array[MAX_BBONE_SUBDIV]); +void BKE_pchan_bbone_spline_setup(struct bPoseChannel *pchan, int rest, Mat4 result_array[MAX_BBONE_SUBDIV]); /* like EBONE_VISIBLE */ #define PBONE_VISIBLE(arm, bone) ( \ diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 4ad9e9c8205..0f9c79c5e3e 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -443,7 +443,7 @@ void equalize_bbone_bezier(float *data, int desired) /* returns pointer to static array, filled with desired amount of bone->segments elements */ /* this calculation is done within unit bone space */ -void b_bone_spline_setup(bPoseChannel *pchan, int rest, Mat4 result_array[MAX_BBONE_SUBDIV]) +void BKE_pchan_bbone_spline_setup(bPoseChannel *pchan, int rest, Mat4 result_array[MAX_BBONE_SUBDIV]) { bPoseChannel *next, *prev; Bone *bone = pchan->bone; @@ -734,8 +734,8 @@ static void pchan_b_bone_defmats(bPoseChannel *pchan, bPoseChanDeform *pdef_info DualQuat *b_bone_dual_quats = NULL; int a; - b_bone_spline_setup(pchan, 0, b_bone); - b_bone_spline_setup(pchan, 1, b_bone_rest); + BKE_pchan_bbone_spline_setup(pchan, 0, b_bone); + BKE_pchan_bbone_spline_setup(pchan, 1, b_bone_rest); /* allocate b_bone matrices and dual quats */ b_bone_mats = MEM_mallocN((1 + bone->segments) * sizeof(Mat4), "BBone defmats"); diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 66147c44352..6fa0224e3ca 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -586,7 +586,7 @@ static void constraint_target_to_mat4(Object *ob, const char *substring, float m float loc[3], fac; /* get bbone segments */ - b_bone_spline_setup(pchan, 0, bbone); + BKE_pchan_bbone_spline_setup(pchan, 0, bbone); /* figure out which segment(s) the headtail value falls in */ fac = (float)pchan->bone->segments * headtail; |