diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-07-20 20:17:24 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-07-20 20:18:45 +0300 |
| commit | a5ded0720ccf1433d8316b44516866373042917e (patch) | |
| tree | 355f7a340ab800e1911167d8f41051bb0734db14 /source/blender/blenkernel/intern/lib_id_delete.c | |
| parent | bb63ce9839322c2730721ffd552edc98c875d897 (diff) | |
Fix (unreported) broken deletion of Shapekeys alongside their owner ID.
Trying to get shape key pointer after having unlinked its owner from
Main data-base is rather useless... So those shapekeys ended up never
being deleted.
Diffstat (limited to 'source/blender/blenkernel/intern/lib_id_delete.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lib_id_delete.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c index b4f2caac861..561db7d62c2 100644 --- a/source/blender/blenkernel/intern/lib_id_delete.c +++ b/source/blender/blenkernel/intern/lib_id_delete.c @@ -144,15 +144,14 @@ void BKE_id_free_ex(Main *bmain, void *idv, int flag, const bool use_flag_from_i } #endif + Key *key = ((flag & LIB_ID_FREE_NO_MAIN) == 0) ? BKE_key_from_id(id) : NULL; + if ((flag & LIB_ID_FREE_NO_USER_REFCOUNT) == 0) { BKE_libblock_relink_ex(bmain, id, NULL, NULL, 0); } - if ((flag & LIB_ID_FREE_NO_MAIN) == 0) { - Key *key = BKE_key_from_id(id); - if (key != NULL) { - BKE_id_free_ex(bmain, &key->id, flag, use_flag_from_idtag); - } + if ((flag & LIB_ID_FREE_NO_MAIN) == 0 && key != NULL) { + BKE_id_free_ex(bmain, &key->id, flag, use_flag_from_idtag); } BKE_libblock_free_datablock(id, flag); |