diff options
author | Bastien Montagne <bastien@blender.org> | 2020-08-07 18:11:21 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-08-07 18:11:21 +0300 |
commit | a93be410c974d6c8c29ec35c7a905d14bb1bda58 (patch) | |
tree | 22e7bf6b8d888d8a0fa00b5e4c57b6bd8021d2ce /source | |
parent | 8fa42f0bd4e84b49fbba64df771bf63da5b6477d (diff) |
Fix previous commit, we first need to be sure we actually get a mesh...
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 7 |
1 files 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) */ |