replace glGetFloatv(GL_CURRENT_COLOR, col_f); with the current wire color arg.

2012-06-06 18:38:01 +00:00
parent 023fba4735
commit 3e3e5b2ea3
1 changed files with 3 additions and 3 deletions
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -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);