[Bf-blender-cvs] [bfe29e0] master: Revert 7955cb78d it causes GPU_pbvh_buffers_diffuse_changed to always return false, causing update of all pbvh nodes all the time.

[Antony Riakiotakis]

Commit: bfe29e0ef756e948233e44e4daf0d85bb57731b5
Author: Antony Riakiotakis
Date:   Tue Apr 1 20:17:23 2014 +0300
https://developer.blender.org/rBbfe29e0ef756e948233e44e4daf0d85bb57731b5

Revert 7955cb78d it causes GPU_pbvh_buffers_diffuse_changed to always
return false, causing update of all pbvh nodes all the time.

===================================================================

M	source/blender/gpu/intern/gpu_buffers.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index 3b4f08c..3882b7c 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) {