diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-04-15 21:12:35 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-04-15 21:12:51 +0400 |
| commit | 5d189069a476551b2e3d6b9328639b89109cc639 (patch) | |
| tree | 1afbc8ada2b7ff8d4980237739c8d6ecd569c1b2 /source/blender/gpu/intern/gpu_buffers.c | |
| parent | cf01f2c7606b7ad5ed872252613632777816814a (diff) | |
Fix regression, sculpting on mesh with matcaps (without multires/
Diffstat (limited to 'source/blender/gpu/intern/gpu_buffers.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index e2588c251fb..8bbd02ae9c9 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -2576,14 +2576,15 @@ void GPU_draw_pbvh_buffers(GPU_PBVH_Buffers *buffers, DMSetMaterial setMaterial, bool GPU_pbvh_buffers_diffuse_changed(GPU_PBVH_Buffers *buffers, GSet *bm_faces, bool show_diffuse_color) { float diffuse_color[4]; + bool use_matcaps = GPU_material_use_matcaps_get(); if (buffers->show_diffuse_color != show_diffuse_color) return true; - if (buffers->use_matcaps != GPU_material_use_matcaps_get()) + if (buffers->use_matcaps != use_matcaps) return true; - if (buffers->show_diffuse_color == false) + if ((buffers->show_diffuse_color == false) || use_matcaps) return false; if (buffers->mface) { |