[Bf-blender-cvs] [7934e7ab83b] master: Sculpting: Fix for "Hide Mask" does not work with multires

[Sergey Sharybin]

Commit: 7934e7ab83b6eadbedc79fd290aae41ad12532c8
Author: Sergey Sharybin
Date:   Tue Jan 16 14:31:52 2018 +0100
Branches: master
https://developer.blender.org/rB7934e7ab83b6eadbedc79fd290aae41ad12532c8

Sculpting: Fix for "Hide Mask" does not work with 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 afe7a4c4d27..8c6bc982bf2 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -1321,13 +1321,18 @@ void GPU_pbvh_grid_buffers_update(
 							normal_float_to_short_v3(vd->no, fno);
 
 							if (has_mask) {
-								gpu_color_from_mask_quad_copy(key,
-								                              elems[0],
-								                              elems[1],
-								                              elems[2],
-								                              elems[3],
-								                              diffuse_color,
-								                              vd->color);
+								if (show_mask) {
+									gpu_color_from_mask_quad_copy(key,
+									                              elems[0],
+									                              elems[1],
+									                              elems[2],
+									                              elems[3],
+									                              diffuse_color,
+									                              vd->color);
+								}
+								else {
+									F3TOCHAR3(diffuse_color, vd->color);
+								}
 							}
 						}
 					}