diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-06 22:38:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-06 22:38:01 +0400 |
| commit | 3e3e5b2ea3a8dadfbd1dcfe295ddf28bc2236141 (patch) | |
| tree | 630a6092e6e971832337e5b80974e3f9edba55c9 /source | |
| parent | 023fba473546ad1975f03a7490a3829286e82f03 (diff) | |
replace glGetFloatv(GL_CURRENT_COLOR, col_f); with the current wire color arg.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 0803654fd68..cb8b309dc72 100644 --- 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); |