[Bf-blender-cvs] [574b0e2] master: Fix T39626 Matcaps not working in edit mode.

[Antony Riakiotakis]

Commit: 574b0e2c3077effcc11c9d5d45511a58acb2e5c8
Author: Antony Riakiotakis
Date:   Mon Apr 7 21:48:27 2014 +0300
https://developer.blender.org/rB574b0e2c3077effcc11c9d5d45511a58acb2e5c8

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.

===================================================================

M	source/blender/editors/space_view3d/drawobject.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 84b3935..cfb4e1f 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,