diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-24 16:31:47 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-24 16:33:12 +0300 |
| commit | 6ff4babfd420aa9697bfab193577f879db414265 (patch) | |
| tree | 24426f10c0e972aefa13f35419820ef1a6ef9e1c | |
| parent | f15a5440a1e10d0a3cc8f6bcb0693f9d3c98807c (diff) | |
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...
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |