[Bf-blender-cvs] [1568a4b] master: Bugfix: Wrong flags used in Spline IK eval for bounds limits

[Joshua Leung]

Commit: 1568a4b2958c107a7bc4cb77da1a10df3f13d7f7
Author: Joshua Leung
Date:   Fri Jan 16 03:02:04 2015 +1300
Branches: master
https://developer.blender.org/rB1568a4b2958c107a7bc4cb77da1a10df3f13d7f7

Bugfix: Wrong flags used in Spline IK eval for bounds limits

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

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

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

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 03372b9..431c24d 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);