From 6ff4babfd420aa9697bfab193577f879db414265 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 24 Jan 2019 14:31:47 +0100 Subject: Fix T60795: Crash when joining objects with shape keys. Stupid mistake really, cannot use NO_MAIN here, temp shapekey is in Main. Using/fully supporting out-of-main temp IDs is still a bit WIP... --- source/blender/editors/mesh/meshtools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 05c0fddfda0..f67ee0651f4 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -586,7 +586,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) /* free temp copy of destination shapekeys (if applicable) */ if (nkey) { /* We can assume nobody is using that ID currently. */ - BKE_id_free_ex(bmain, nkey, LIB_ID_FREE_NO_MAIN | LIB_ID_FREE_NO_UI_USER | LIB_ID_FREE_NO_USER_REFCOUNT, false); + BKE_id_free_ex(bmain, nkey, LIB_ID_FREE_NO_UI_USER, false); } /* ensure newly inserted keys are time sorted */ -- cgit v1.2.3