replace glGetFloatv(GL_CURRENT_COLOR, col_f); with the current wire color arg.
authorCampbell Barton <ideasman42@gmail.com>
Wed, 6 Jun 2012 18:38:01 +0000 (18:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 6 Jun 2012 18:38:01 +0000 (18:38 +0000)
source/blender/editors/space_view3d/drawarmature.c

index 0803654fd6840f75378803d54c768eb6c38f13c7..cb8b309dc7200f9f41b17fee145a8e3589819730 100644 (file)
@@ -1995,9 +1995,9 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
                        float vec[3];
                        
                        unsigned char col[4];
-                       float col_f[4];
-                       glGetFloatv(GL_CURRENT_COLOR, col_f); /* in case this is not set below */
-                       rgb_float_to_uchar(col, col_f);
+                       col[0] = ob_wire_col[0];
+                       col[1] = ob_wire_col[1];
+                       col[2] = ob_wire_col[2];
                        col[3] = 255;
                        
                        if (v3d->zbuf) glDisable(GL_DEPTH_TEST);