From a93be410c974d6c8c29ec35c7a905d14bb1bda58 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 7 Aug 2020 17:11:21 +0200 Subject: [PATCH] Fix previous commit, we first need to be sure we actually get a mesh... --- source/blender/modifiers/intern/MOD_boolean.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 35aa7805db8..08fd7fb229d 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -178,12 +178,13 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * Object *other = bmd->object; mesh_other = BKE_modifier_get_evaluated_mesh_from_evaluated_object(other, false); - /* XXX This is utterly non-optimal, we may go from a bmesh to a mesh back to a bmesh! - * But for 2.90 better not try to be smart here. */ - BKE_mesh_wrapper_ensure_mdata(mesh_other); if (mesh_other) { Object *object = ctx->object; + /* XXX This is utterly non-optimal, we may go from a bmesh to a mesh back to a bmesh! + * But for 2.90 better not try to be smart here. */ + BKE_mesh_wrapper_ensure_mdata(mesh_other); + /* when one of objects is empty (has got no faces) we could speed up * calculation a bit returning one of objects' derived meshes (or empty one) * Returning mesh is depended on modifiers operation (sergey) */