From 8fa42f0bd4e84b49fbba64df771bf63da5b6477d Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 7 Aug 2020 17:07:30 +0200 Subject: Fix T79604: Switching to edit mode on boolean object runs out of memory. Note that this is a dummy safe fix for now, far from optimal. --- source/blender/modifiers/intern/MOD_boolean.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender') diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 1d39aa786a5..35aa7805db8 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -44,6 +44,7 @@ #include "BKE_lib_query.h" #include "BKE_material.h" #include "BKE_mesh.h" +#include "BKE_mesh_wrapper.h" #include "BKE_modifier.h" #include "BKE_screen.h" @@ -177,6 +178,9 @@ 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; -- cgit v1.2.3