[Bf-blender-cvs] [0bdb1eab82f] master: Sculpting: Fix uninitialized color being left for smooth meshes with hidden mask

[Sergey Sharybin]

Commit: 0bdb1eab82f6582a2df1f55f19a03653846104a0
Author: Sergey Sharybin
Date:   Tue Jan 16 14:46:48 2018 +0100
Branches: master
https://developer.blender.org/rB0bdb1eab82f6582a2df1f55f19a03653846104a0

Sculpting: Fix uninitialized color being left for smooth meshes with hidden mask

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

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 8c6bc982bf2..d6e01b6765a 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -1288,9 +1288,14 @@ void GPU_pbvh_grid_buffers_update(
 						if (buffers->smooth) {
 							normal_float_to_short_v3(vd->no, CCG_elem_no(key, elem));
 
-							if (has_mask && show_mask) {
-								gpu_color_from_mask_copy(*CCG_elem_mask(key, elem),
-								                         diffuse_color, vd->color);
+							if (has_mask) {
+								if (show_mask) {
+									gpu_color_from_mask_copy(*CCG_elem_mask(key, elem),
+									                         diffuse_color, vd->color);
+								}
+								else {
+									F3TOCHAR3(diffuse_color, vd->color);
+								}
 							}
 						}
 						vd++;