From cced07661a4fcfd156caec81073d97c060677a15 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 8 Apr 2014 01:24:45 +0300 Subject: Matcaps. Instead of setting color every time, just set it on material enable. Handles all cases of surfaces. Thanks to Campbell for pointing out! --- source/blender/gpu/intern/gpu_draw.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/gpu/intern/gpu_draw.c') diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 64ab701acba..99f98f713ce 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1597,6 +1597,9 @@ int GPU_enable_material(int nr, void *attribs) else glDisable(GL_CULL_FACE); } + + if (GMS.use_matcaps) + glColor3f(1.0, 1.0, 1.0f); } else { /* or do fixed function opengl material */ -- cgit v1.2.3