diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:32:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:37:04 +0300 |
| commit | 55b31dd98ce592ef4e51a9f9edece9ade7c519db (patch) | |
| tree | 290f5170ce123029d4b5eb3e801605daae7708bb /source/blender/draw/intern/draw_armature.c | |
| parent | 2e392a0fdc0975e500d7ea07bfbfc781f5ddd190 (diff) | |
| parent | 335e1b507b1ad0e7c2bafb2175dac15d3d1add83 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw/intern/draw_armature.c')
| -rw-r--r-- | source/blender/draw/intern/draw_armature.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index aec25274ab1..b8b53fbbb78 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -940,7 +940,7 @@ static void edbo_compute_bbone_child(bArmature *arm) } } -/* A version of b_bone_spline_setup() for previewing editmode curve settings. */ +/* A version of BKE_pchan_bbone_spline_setup() for previewing editmode curve settings. */ static void ebone_spline_preview(EditBone *ebone, float result_array[MAX_BBONE_SUBDIV][4][4]) { BBoneSplineParameters param; @@ -1043,7 +1043,7 @@ static void ebone_spline_preview(EditBone *ebone, float result_array[MAX_BBONE_S param.curveOutX = ebone->curveOutX; param.curveOutY = ebone->curveOutY; - ebone->segments = BKE_compute_b_bone_spline(¶m, (Mat4 *)result_array); + ebone->segments = BKE_pchan_bbone_spline_compute(¶m, (Mat4 *)result_array); } static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pchan) @@ -1086,7 +1086,7 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc memcpy(bbones_mat, pchan->runtime.bbone_pose_mats, sizeof(Mat4) * bbone_segments); } else { - b_bone_spline_setup(pchan, false, bbones_mat); + BKE_pchan_bbone_spline_setup(pchan, false, bbones_mat); } for (int i = bbone_segments; i--; bbones_mat++) { |