[Bf-blender-cvs] [5d18906] master: Fix regression, sculpting on mesh with matcaps (without multires/

Antony Riakiotakis noreply at git.blender.org
Tue Apr 15 19:13:00 CEST 2014


Commit: 5d189069a476551b2e3d6b9328639b89109cc639
Author: Antony Riakiotakis
Date:   Tue Apr 15 20:12:35 2014 +0300
https://developer.blender.org/rB5d189069a476551b2e3d6b9328639b89109cc639

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

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

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 e2588c2..8bbd02a 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) {




More information about the Bf-blender-cvs mailing list