Merging r58362 through r58463 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / blenkernel / intern / armature.c
index 1eb8f4f8b7a1906e67332aa980b538c715e1ddd9..c4b37b1d9bde5b75bab4710f67ffa942be31b4fa 100644 (file)
@@ -2092,8 +2092,8 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
                                /* z-axis scale */
                                scale = len_v3(pchan->pose_mat[2]);
                                mul_v3_fl(poseMat[2], scale);
+                               break;
                        }
-                       break;
                        case CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC:
                        {
                                /* 'volume preservation' */
@@ -2115,8 +2115,8 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
                                /* apply the scaling */
                                mul_v3_fl(poseMat[0], scale);
                                mul_v3_fl(poseMat[2], scale);
+                               break;
                        }
-                       break;
                }
 
                /* finally, multiply the x and z scaling by the radius of the curve too,