diff options
author | Joshua Leung <aligorith@gmail.com> | 2016-05-13 18:00:12 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2016-05-17 17:28:48 +0300 |
commit | 0d07ee84fb42efe2f09d02f080b24e8234691156 (patch) | |
tree | 3ea5575c88c4cb0976cbbd9399e5e32bb07a2373 | |
parent | 980c7af04a9eda63bf6497d45e89a2d3e8cbffe1 (diff) |
Bendy Bones: Restore bone->ease1/2 for hlength1/2 calcs
It turns out that this wasn't changed in the patch after all...
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 7a15ae6398f..51f1e784c63 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -496,13 +496,8 @@ void b_bone_spline_setup(bPoseChannel *pchan, int rest, Mat4 result_array[MAX_BB } } - hlength1 = length * 0.390464f; /* 0.5f * sqrt(2) * kappa, the handle length for near-perfect circles */ - hlength2 = length * 0.390464f; - - if (!rest) { - hlength1 *= bone->ease1; - hlength2 *= bone->ease2; - } + 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 */ if (bone->flag & BONE_CONNECTED) |