[Bf-blender-cvs] [afc86042b7d] sculpt-dev: Sculpt-dev: fix remesh crash and a compile error.

[Joseph Eagar]

Commit: afc86042b7df08af89e01c8c114a116609a31288
Author: Joseph Eagar
Date:   Tue Apr 19 19:16:31 2022 -0700
Branches: sculpt-dev
https://developer.blender.org/rBafc86042b7df08af89e01c8c114a116609a31288

Sculpt-dev: fix remesh crash and a compile error.

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

M	source/blender/blenkernel/intern/pbvh.cc
M	source/blender/editors/object/object_remesh.cc

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

diff --git a/source/blender/blenkernel/intern/pbvh.cc b/source/blender/blenkernel/intern/pbvh.cc
index 0475296daa2..1ad62987435 100644
--- a/source/blender/blenkernel/intern/pbvh.cc
+++ b/source/blender/blenkernel/intern/pbvh.cc
@@ -43,24 +43,6 @@ using blender::IndexRange;
 
 namespace blender::bke {
 
-template<typename T> inline void *get_color_pointer(PBVH, SculptVertRef vref)
-{
-  const size_t esize = pbvh->color_layer->type == CD_PROP_COLOR ? sizeof(MPropCol) :
-                                                                  sizeof(MLoopCol);
-
-  switch (pbvh->type) {
-    case PBVH_FACES:
-      return POINTER_OFFSET(pbvh->color_layer->data, (size_t)vref.i * esize);
-    case PBVH_BMESH: {
-      BMVert *v = reinterpret_cast<BMVert *>(vref.i);
-
-      return BM_ELEM_CD_GET_VOID_P(v, pbvh->cd_vcol_offset);
-    }
-    default:
-      return nullptr;
-  }
-}
-
 template<typename Func>
 inline void to_static_color_type(const CustomDataType type, const Func &func)
 {
diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc
index 8bf5b810ecc..d8ca1fffafc 100644
--- a/source/blender/editors/object/object_remesh.cc
+++ b/source/blender/editors/object/object_remesh.cc
@@ -145,6 +145,7 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op)
 
   if (ob->mode == OB_MODE_SCULPT) {
     ED_sculpt_undo_geometry_begin(ob, op->type->name);
+    ob->sculpt->needs_pbvh_rebuild = true;
   }
 
   if (mesh->flag & ME_REMESH_FIX_POLES && mesh->remesh_voxel_adaptivity <= 0.0f) {