[Bf-blender-cvs] [8787532] master: Bugfix: The "bulge_min" setting for the Stretch To constraint prevented bones from shrinking below 1.0 scale

[Joshua Leung]

Commit: 8787532184e648e38b4ecee0709dcf87b95862b1
Author: Joshua Leung
Date:   Tue Jan 13 18:13:57 2015 +1300
Branches: master
https://developer.blender.org/rB8787532184e648e38b4ecee0709dcf87b95862b1

Bugfix: The "bulge_min" setting for the Stretch To constraint prevented bones from shrinking below 1.0 scale

>From the looks of things, this was a typo. The result was that if you had a bone
with the minimum volume restriction in place, the bone would not get any thinner
when it was stretched out.

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

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

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

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 88b46ef..9232cd6 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -2213,7 +2213,7 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
 					}
 					if (bulge < 1.0f) {
 						if (ikData->flag & STRETCHTOCON_USE_BULGE_MIN) {
-							float bulge_min = CLAMPIS(ikData->bulge_max, 0.0f, 1.0f);
+							float bulge_min = CLAMPIS(ikData->bulge_min, 0.0f, 1.0f);
 							float hard = max_ff(bulge, bulge_min);
 							
 							float range = 1.0f - bulge_min;
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 9072acd..5f97abb 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -2722,7 +2722,7 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
 		}
 		if (bulge < 1.0f) {
 			if (data->flag & STRETCHTOCON_USE_BULGE_MIN) {
-				float bulge_min = CLAMPIS(data->bulge_max, 0.0f, 1.0f);
+				float bulge_min = CLAMPIS(data->bulge_min, 0.0f, 1.0f);
 				float hard = max_ff(bulge, bulge_min);
 				
 				float range = 1.0f - bulge_min;