[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47532] trunk/blender/source/blender/ editors/space_view3d/drawarmature.c: replace glGetFloatv(GL_CURRENT_COLOR, col_f); with the current wire color arg.
Campbell Barton
ideasman42 at gmail.com
Wed Jun 6 20:38:16 CEST 2012
Revision: 47532
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47532
Author: campbellbarton
Date: 2012-06-06 18:38:01 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
replace glGetFloatv(GL_CURRENT_COLOR, col_f); with the current wire color arg.
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 2012-06-06 18:16:53 UTC (rev 47531)
+++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c 2012-06-06 18:38:01 UTC (rev 47532)
@@ -1995,9 +1995,9 @@
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);
More information about the Bf-blender-cvs
mailing list