diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-04-08 02:24:45 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-04-08 02:25:49 +0400 |
commit | cced07661a4fcfd156caec81073d97c060677a15 (patch) | |
tree | 5db2418dda3ecb28d126cb33a67695b23e8a7542 /source/blender/gpu/intern/gpu_draw.c | |
parent | 1e6d2b1dbf1a6316608fbfad81cf5b2ad147eb05 (diff) |
Matcaps.
Instead of setting color every time, just set it on material enable.
Handles all cases of surfaces. Thanks to Campbell for pointing out!
Diffstat (limited to 'source/blender/gpu/intern/gpu_draw.c')
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 3 |
1 files changed, 3 insertions, 0 deletions
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 */ |