Bugfix #3231

Constraint Ipos didnt work when the bone/channel had no Action Ipo...
just had to move a line of code. :)

2 files changed, 3 insertions, 5 deletions

diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 8d61c4ce865..64d6d1f5abd 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -505,14 +505,12 @@ void extract_pose_from_action(bPose *pose, bAction *act, float ctime)
 		if(achan) {
 			ipo = achan->ipo;
 			if (ipo) {
-				
 				/* Evaluates and sets the internal ipo value */
 				calc_ipo(ipo, ctime);
 				/* This call also sets the pchan flags */
 				execute_action_ipo(achan, pchan);
-				
-				do_constraint_channels(&pchan->constraints, &achan->constraintChannels, ctime);
 			}
+			do_constraint_channels(&pchan->constraints, &achan->constraintChannels, ctime);
 		}
 	}
 }
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index b0dbc49fcf6..0e682b3a58c 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -669,8 +669,8 @@ void do_constraint_channels (ListBase *conbase, ListBase *chanbase, float ctime)
 				switch (icu->adrcode){
 				case CO_ENFORCE:
 					con->enforce = icu->curval;
-					if (con->enforce<0) con->enforce=0;
-					else if (con->enforce>1) con->enforce=1;
+					if (con->enforce<0.0f) con->enforce= 0.0f;
+					else if (con->enforce>1.0f) con->enforce= 1.0f;
 					break;
 				}
 			}