Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix assert running remesh with OpenVDB disabled

Browse Source
This commit is contained in:
Campbell Barton
2019-11-20 14:50:15 +11:00
parent 3b16578fb4
commit 858bd1d4d0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/object/object_remesh.c
View File

@@ -113,10 +113,6 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }
if (ob->mode == OB_MODE_SCULPT) {
ED_sculpt_undo_geometry_begin(ob, op->type->name);
}
float isovalue = 0.0f; float isovalue = 0.0f;
if (mesh->flag & ME_REMESH_REPROJECT_VOLUME) { if (mesh->flag & ME_REMESH_REPROJECT_VOLUME) {
isovalue = mesh->remesh_voxel_size * 0.3f; isovalue = mesh->remesh_voxel_size * 0.3f;
@@ -126,9 +122,14 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op)
mesh, mesh->remesh_voxel_size, mesh->remesh_voxel_adaptivity, isovalue); mesh, mesh->remesh_voxel_size, mesh->remesh_voxel_adaptivity, isovalue);
if (!new_mesh) { if (!new_mesh) {
BKE_report(op->reports, RPT_ERROR, "Voxel remesher failed to create mesh.");
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }
if (ob->mode == OB_MODE_SCULPT) {
ED_sculpt_undo_geometry_begin(ob, op->type->name);
}
if (mesh->flag & ME_REMESH_FIX_POLES && mesh->remesh_voxel_adaptivity <= 0.0f) { if (mesh->flag & ME_REMESH_FIX_POLES && mesh->remesh_voxel_adaptivity <= 0.0f) {
new_mesh = BKE_mesh_remesh_voxel_fix_poles(new_mesh); new_mesh = BKE_mesh_remesh_voxel_fix_poles(new_mesh);
BKE_mesh_calc_normals(new_mesh); BKE_mesh_calc_normals(new_mesh);