Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2015-01-15 17:02:04 +0300
committerJoshua Leung <aligorith@gmail.com>2015-01-15 17:02:28 +0300
commit1568a4b2958c107a7bc4cb77da1a10df3f13d7f7 (patch)
tree9f8275f63cf2a5b01d8006a7970f276ac0797da8 /source/blender/blenkernel/intern/armature.c
parent4b0007cf821caa0f51b16275ec011949de318c89 (diff)
Bugfix: Wrong flags used in Spline IK eval for bounds limits
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
-rw-r--r--source/blender/blenkernel/intern/armature.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 03372b97049..431c24d3ed0 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -2200,7 +2200,7 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
float bulge = powf(1.0f / fabsf(scaleFac), ikData->bulge);
if (bulge > 1.0f) {
- if (ikData->flag & STRETCHTOCON_USE_BULGE_MAX) {
+ if (ikData->flag & CONSTRAINT_SPLINEIK_USE_BULGE_MAX) {
float bulge_max = max_ff(ikData->bulge_max, 1.0f);
float hard = min_ff(bulge, bulge_max);
@@ -2212,7 +2212,7 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
}
}
if (bulge < 1.0f) {
- if (ikData->flag & STRETCHTOCON_USE_BULGE_MIN) {
+ if (ikData->flag & CONSTRAINT_SPLINEIK_USE_BULGE_MIN) {
float bulge_min = CLAMPIS(ikData->bulge_min, 0.0f, 1.0f);
float hard = max_ff(bulge, bulge_min);