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

This commit is contained in:
Joseph Eagar 2022-04-19 19:16:31 -07:00
parent c4f48e240e
commit afc86042b7
2 changed files with 1 additions and 18 deletions

View File

@ -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)
{

View File

@ -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) {