Sculpting: Fix for "Hide Mask" does not work with multires

2018-01-16 14:31:52 +01:00
parent 67e4b1d3e9
commit 7934e7ab83
1 changed files with 12 additions and 7 deletions
--- 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);
+								}
 							}
 						}
 					}