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.
This commit is contained in:
Joshua Leung 2015-01-13 18:13:57 +13:00
parent f0361fcf54
commit 8787532184
2 changed files with 2 additions and 2 deletions

View File

@ -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;

View File

@ -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;