[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38112] trunk/blender/source/blender/ editors/space_view3d/drawarmature.c: Fix #27810: bones drawn blue in 2. 49 file, was still checking stride bone

[Brecht Van Lommel]

Revision: 38112
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38112
Author:   blendix
Date:     2011-07-05 09:35:38 +0000 (Tue, 05 Jul 2011)
Log Message:
-----------
Fix #27810: bones drawn blue in 2.49 file, was still checking stride bone
flag for drawing even though that feature is no longer in 2.5.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawarmature.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawarmature.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawarmature.c    
2011-07-05 08:57:11 UTC (rev 38111)
+++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c    
2011-07-05 09:35:38 UTC (rev 38112)
@@ -197,8 +197,7 @@
        case PCHAN_COLOR_CONSTS:
        {
                if ( (bcolor == NULL) || (bcolor->flag & 
TH_WIRECOLOR_CONSTCOLS) ) {
-                       if (constflag & PCHAN_HAS_STRIDE) glColor4ub(0, 0, 200, 
80);
-                       else if (constflag & PCHAN_HAS_TARGET) glColor4ub(255, 
150, 0, 80);
+                       if (constflag & PCHAN_HAS_TARGET) glColor4ub(255, 150, 
0, 80);
                        else if (constflag & PCHAN_HAS_IK) glColor4ub(255, 255, 
0, 80);
                        else if (constflag & PCHAN_HAS_SPLINEIK) 
glColor4ub(200, 255, 0, 80);
                        else if (constflag & PCHAN_HAS_CONST) glColor4ub(0, 
255, 120, 80);
@@ -269,8 +268,7 @@
        {
                /* inner part in background color or constraint */
                if ( (constflag) && ((bcolor==NULL) || (bcolor->flag & 
TH_WIRECOLOR_CONSTCOLS)) ) {
-                       if (constflag & PCHAN_HAS_STRIDE) glColor3ub(0, 0, 200);
-                       else if (constflag & PCHAN_HAS_TARGET) glColor3ub(255, 
150, 0);
+                       if (constflag & PCHAN_HAS_TARGET) glColor3ub(255, 150, 
0);
                        else if (constflag & PCHAN_HAS_IK) glColor3ub(255, 255, 
0);
                        else if (constflag & PCHAN_HAS_SPLINEIK) 
glColor3ub(200, 255, 0);
                        else if (constflag & PCHAN_HAS_CONST) glColor3ub(0, 
255, 120);
@@ -1865,9 +1863,7 @@
                                        constflag= pchan->constflag;
                                        if (pchan->flag & 
(POSE_ROT|POSE_LOC|POSE_SIZE))
                                                constflag |= PCHAN_HAS_ACTION;
-                                       if (pchan->flag & POSE_STRIDE)
-                                               constflag |= PCHAN_HAS_STRIDE;
-                                               
+
                                        /* set color-set to use */
                                        set_pchan_colorset(ob, pchan);
                                        

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs