Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-01-16 16:46:48 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-01-16 16:46:48 +0300
commit0bdb1eab82f6582a2df1f55f19a03653846104a0 (patch)
tree26954318e891c2e80a871042664f65735bed859e /source/blender
parent7934e7ab83b6eadbedc79fd290aae41ad12532c8 (diff)
Sculpting: Fix uninitialized color being left for smooth meshes with hidden mask
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/gpu/intern/gpu_buffers.c11
1 files changed, 8 insertions, 3 deletions
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++;