diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-04-01 21:17:23 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-04-01 21:17:23 +0400 |
| commit | bfe29e0ef756e948233e44e4daf0d85bb57731b5 (patch) | |
| tree | c5e791cc7d415c9b56daa27f73e211acd63dabc4 /source | |
| parent | 3ed49a810d469174d2c0233dcb03d249adc60056 (diff) | |
Revert 7955cb78d it causes GPU_pbvh_buffers_diffuse_changed to always
return false, causing update of all pbvh nodes all the time.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 3b4f08c2222..3882b7c8ebe 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -1442,7 +1442,7 @@ void GPU_update_mesh_pbvh_buffers(GPU_PBVH_Buffers *buffers, MVert *mvert, int i, j, k; buffers->vmask = vmask; - buffers->show_diffuse_color = (vmask == NULL) || show_diffuse_color; + buffers->show_diffuse_color = show_diffuse_color; if (buffers->vert_buf) { int totelem = (buffers->smooth ? totvert : (buffers->tot_tri * 3)); @@ -1657,7 +1657,7 @@ void GPU_update_grid_pbvh_buffers(GPU_PBVH_Buffers *buffers, CCGElem **grids, VertexBufferFormat *vert_data; int i, j, k, x, y; - buffers->show_diffuse_color = (key->has_mask == false) || show_diffuse_color; + buffers->show_diffuse_color = show_diffuse_color; /* Build VBO */ if (buffers->vert_buf) { |