[Bf-blender-cvs] [0d07ee8] BendyBones: Bendy Bones: Restore bone->ease1/2 for hlength1/2 calcs

[Joshua Leung]

Commit: 0d07ee84fb42efe2f09d02f080b24e8234691156
Author: Joshua Leung
Date:   Sat May 14 03:00:12 2016 +1200
Branches: BendyBones
https://developer.blender.org/rB0d07ee84fb42efe2f09d02f080b24e8234691156

Bendy Bones: Restore bone->ease1/2 for hlength1/2 calcs

It turns out that this wasn't changed in the patch after all...

===================================================================

M	source/blender/blenkernel/intern/armature.c

===================================================================

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 7a15ae6..51f1e78 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)