[Bf-blender-cvs] [6637ad54324] temp-pbvh-vbos: Merge branch 'master' into temp-pbvh-vbos

[Joseph Eagar]

Commit: 6637ad543241211bd49a02bcc83f03eef4f19584
Author: Joseph Eagar
Date:   Sat Sep 24 13:38:38 2022 -0700
Branches: temp-pbvh-vbos
https://developer.blender.org/rB6637ad543241211bd49a02bcc83f03eef4f19584

Merge branch 'master' into temp-pbvh-vbos

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



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

diff --cc source/blender/draw/engines/overlay/overlay_sculpt.cc
index e760d66fa6d,ddad1f06537..8f142d68350
--- a/source/blender/draw/engines/overlay/overlay_sculpt.cc
+++ b/source/blender/draw/engines/overlay/overlay_sculpt.cc
@@@ -53,10 -53,10 +53,10 @@@ void OVERLAY_sculpt_cache_populate(OVER
    }
  
    if (use_pbvh) {
 -    DRW_shgroup_call_sculpt(pd->sculpt_mask_grp, ob, false, true);
 +    DRW_shgroup_call_sculpt(pd->sculpt_mask_grp, ob, false, true, true, false, false);
    }
    else {
-     sculpt_overlays = DRW_mesh_batch_cache_get_sculpt_overlays(ob->data);
+     sculpt_overlays = DRW_mesh_batch_cache_get_sculpt_overlays(static_cast<Mesh *>(ob->data));
      if (sculpt_overlays) {
        DRW_shgroup_call(pd->sculpt_mask_grp, sculpt_overlays, ob);
      }