diff options
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
| -rw-r--r-- | source/blender/blenkernel/intern/armature.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 09b295aabf1..fe95d15f82e 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -459,7 +459,7 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest) } } - hlength1 = bone->ease1 * length * 0.390464f; /* 0.5*sqrt(2)*kappa, the handle length for near-perfect circles */ + hlength1 = bone->ease1 * length * 0.390464f; /* 0.5f * sqrt(2) * kappa, the handle length for near-perfect circles */ hlength2 = bone->ease2 * length * 0.390464f; /* evaluate next and prev bones */ @@ -566,14 +566,10 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest) if (bone->segments > MAX_BBONE_SUBDIV) bone->segments = MAX_BBONE_SUBDIV; - BKE_curve_forward_diff_bezier(0.0, h1[0], h2[0], 0.0, data[0], - MAX_BBONE_SUBDIV, 4*sizeof(float)); - BKE_curve_forward_diff_bezier(0.0, h1[1], length + h2[1], length, data[0]+1, - MAX_BBONE_SUBDIV, 4*sizeof(float)); - BKE_curve_forward_diff_bezier(0.0, h1[2], h2[2], 0.0, data[0]+2, - MAX_BBONE_SUBDIV, 4*sizeof(float)); - BKE_curve_forward_diff_bezier(roll1, roll1 + 0.390464f*(roll2-roll1), roll2 - 0.390464f*(roll2-roll1), roll2, data[0]+3, - MAX_BBONE_SUBDIV, 4*sizeof(float)); + BKE_curve_forward_diff_bezier(0.0f, h1[0], h2[0], 0.0f, data[0], MAX_BBONE_SUBDIV, 4 * sizeof(float)); + BKE_curve_forward_diff_bezier(0.0f, h1[1], length + h2[1], length, data[0] + 1, MAX_BBONE_SUBDIV, 4 * sizeof(float)); + BKE_curve_forward_diff_bezier(0.0f, h1[2], h2[2], 0.0f, data[0] + 2, MAX_BBONE_SUBDIV, 4 * sizeof(float)); + BKE_curve_forward_diff_bezier(roll1, roll1 + 0.390464f * (roll2 - roll1), roll2 - 0.390464f * (roll2 - roll1), roll2, data[0] + 3, MAX_BBONE_SUBDIV, 4 * sizeof(float)); equalize_bezier(data[0], bone->segments); /* note: does stride 4! */ @@ -2545,20 +2541,20 @@ int get_selected_defgroups(Object *ob, char *dg_selection, int defbase_tot) } /************** Bounding box ********************/ -int minmax_armature(Object *ob, float min[3], float max[3]) +static int minmax_armature(Object *ob, float r_min[3], float r_max[3]) { bPoseChannel *pchan; /* For now, we assume BKE_pose_where_is has already been called (hence we have valid data in pachan). */ for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { - DO_MINMAX(pchan->pose_head, min, max); - DO_MINMAX(pchan->pose_tail, min, max); + minmax_v3v3_v3(r_min, r_max, pchan->pose_head); + minmax_v3v3_v3(r_min, r_max, pchan->pose_tail); } return (ob->pose->chanbase.first != NULL); } -void boundbox_armature(Object *ob, float *loc, float *size) +static void boundbox_armature(Object *ob, float loc[3], float size[3]) { BoundBox *bb; float min[3], max[3]; |