[Bf-blender-cvs] [236794d07a7] master: Merge branch 'blender-v2.83-release'

[Jeroen Bakker]

Commit: 236794d07a707a5cf4b8aff9d441f88590d69901
Author: Jeroen Bakker
Date:   Thu May 14 14:30:34 2020 +0200
Branches: master
https://developer.blender.org/rB236794d07a707a5cf4b8aff9d441f88590d69901

Merge branch 'blender-v2.83-release'

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



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

diff --cc source/blender/blenkernel/intern/pbvh.c
index b65089c7599,7d5a0e7fd91..fb049d41d40
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@@ -1245,17 -1244,15 +1244,15 @@@ void pbvh_update_BB_redraw(PBVH *bvh, P
        .flag = flag,
    };
  
 -  PBVHParallelSettings settings;
 +  TaskParallelSettings settings;
    BKE_pbvh_parallel_range_settings(&settings, true, totnode);
 -  BKE_pbvh_parallel_range(0, totnode, &data, pbvh_update_BB_redraw_task_cb, &settings);
 +  BLI_task_parallel_range(0, totnode, &data, pbvh_update_BB_redraw_task_cb, &settings);
  }
  
- static int pbvh_get_buffers_update_flags(PBVH *bvh, bool show_vcol)
+ static int pbvh_get_buffers_update_flags(PBVH *UNUSED(bvh))
  {
-   int update_flags = 0;
-   update_flags |= bvh->show_mask ? GPU_PBVH_BUFFERS_SHOW_MASK : 0;
-   update_flags |= show_vcol ? GPU_PBVH_BUFFERS_SHOW_VCOL : 0;
-   update_flags |= bvh->show_face_sets ? GPU_PBVH_BUFFERS_SHOW_SCULPT_FACE_SETS : 0;
+   int update_flags = GPU_PBVH_BUFFERS_SHOW_VCOL | GPU_PBVH_BUFFERS_SHOW_MASK |
+                      GPU_PBVH_BUFFERS_SHOW_SCULPT_FACE_SETS;
    return update_flags;
  }
  
@@@ -1362,12 -1358,11 +1358,11 @@@ static void pbvh_update_draw_buffers(PB
    PBVHUpdateData data = {
        .bvh = bvh,
        .nodes = nodes,
-       .show_vcol = show_vcol,
    };
  
 -  PBVHParallelSettings settings;
 +  TaskParallelSettings settings;
    BKE_pbvh_parallel_range_settings(&settings, true, totnode);
 -  BKE_pbvh_parallel_range(0, totnode, &data, pbvh_update_draw_buffer_cb, &settings);
 +  BLI_task_parallel_range(0, totnode, &data, pbvh_update_draw_buffer_cb, &settings);
  }
  
  static int pbvh_flush_bb(PBVH *bvh, PBVHNode *node, int flag)