sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix regression, sculpting on mesh with matcaps (without multires/

Browse Source
This commit is contained in:
Antony Riakiotakis 2014-04-15 20:12:35 +03:00
parent cf01f2c760
commit 5d189069a4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/gpu/intern/gpu_buffers.c
View File

@ -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) bool GPU_pbvh_buffers_diffuse_changed(GPU_PBVH_Buffers *buffers, GSet *bm_faces, bool show_diffuse_color)
{ {
float diffuse_color[4]; float diffuse_color[4];
bool use_matcaps = GPU_material_use_matcaps_get();
if (buffers->show_diffuse_color != show_diffuse_color) if (buffers->show_diffuse_color != show_diffuse_color)
return true; return true;
if (buffers->use_matcaps != GPU_material_use_matcaps_get()) if (buffers->use_matcaps != use_matcaps)
return true; return true;
if (buffers->show_diffuse_color == false) if ((buffers->show_diffuse_color == false) || use_matcaps)
return false; return false;
if (buffers->mface) { if (buffers->mface) {