Merging r58362 through r58463 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / editors / space_view3d / drawarmature.c
index 3cf4c1e51d635a6554b3d0b03bf988b82c7b05d5..9e4ab652b444c68cf19d31b2fdd980c22c732772 100644 (file)
@@ -187,8 +187,6 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
        
                        return true;
                }
-               break;
-               
                case PCHAN_COLOR_SOLID:
                {
                        if (bcolor) {
@@ -199,8 +197,6 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
                        
                        return true;
                }
-               break;
-               
                case PCHAN_COLOR_CONSTS:
                {
                        if ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS)) {
@@ -211,11 +207,8 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
                        
                                return true;
                        }
-                       else
-                               return 0;
+                       return false;
                }
-               break;
-
                case PCHAN_COLOR_SPHEREBONE_BASE:
                {
                        if (bcolor) {
@@ -241,7 +234,6 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
                        
                        return true;
                }
-               break;
                case PCHAN_COLOR_SPHEREBONE_END:
                {
                        if (bcolor) {
@@ -267,9 +259,8 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
                                else if (boneflag & BONE_SELECTED) UI_ThemeColorShade(TH_BONE_POSE, -30);
                                else UI_ThemeColorShade(TH_BONE_SOLID, -30);
                        }
+                       break;
                }
-               break;
-               
                case PCHAN_COLOR_LINEBONE:
                {
                        /* inner part in background color or constraint */
@@ -291,7 +282,6 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
                
                        return true;
                }
-               break;
        }
        
        return false;
@@ -1432,8 +1422,8 @@ static void pchan_draw_IK_root_lines(bPoseChannel *pchan, short only_temp)
                                
                                glEnd();
                                setlinestyle(0);
+                               break;
                        }
-                       break;
                        case CONSTRAINT_TYPE_SPLINEIK: 
                        {
                                bSplineIKConstraint *data = (bSplineIKConstraint *)con->data;
@@ -1457,8 +1447,8 @@ static void pchan_draw_IK_root_lines(bPoseChannel *pchan, short only_temp)
 
                                glEnd();
                                setlinestyle(0);
+                               break;
                        }
-                       break;
                }
        }
 }