diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-04-07 22:48:27 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-04-07 22:49:02 +0400 |
| commit | 574b0e2c3077effcc11c9d5d45511a58acb2e5c8 (patch) | |
| tree | 0bcf556fa0142930c06498fdd0e677f9b3f7b7c9 /source/blender/editors/space_view3d/drawobject.c | |
| parent | 1645f4fef0b8f3f938634435acdeabc623479c2c (diff) | |
Fix T39626 Matcaps not working in edit mode.
Set a while color before the draw call. This will be ineffective in GLSL
but will affect matcaps.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 84b39356089..cfb4e1f6b70 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3190,6 +3190,8 @@ static void draw_em_fancy(Scene *scene, ARegion *ar, View3D *v3d, } else if (check_object_draw_texture(scene, v3d, dt)) { if (draw_glsl_material(scene, ob, v3d, dt)) { + /* this will be ignored mostly, but is relevant for matcaps */ + glColor3f(1.0f, 1.0f, 1.0f); glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW); finalDM->drawMappedFacesGLSL(finalDM, GPU_enable_material, |