diff options
author | Hans Goudey <h.goudey@me.com> | 2021-08-27 07:41:41 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-08-27 07:41:41 +0300 |
commit | a0f754e7749a485c97718433edbbab5ac76cdc7a (patch) | |
tree | d968d66e73be6dbac5997a3f5bb8e33e462c96d3 /source/blender/blenkernel/intern/lib_id_delete.c | |
parent | 137a5e162c2435662dbb299ff49771e7d2e7598f (diff) | |
parent | 523bc981cfeecead5050e7af44bbe252c166d718 (diff) |
Merge branch 'master' into refactor-idprop-ui-datarefactor-idprop-ui-data
Diffstat (limited to 'source/blender/blenkernel/intern/lib_id_delete.c')
-rw-r--r-- | source/blender/blenkernel/intern/lib_id_delete.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c index 43afac5a376..79717fe5f48 100644 --- a/source/blender/blenkernel/intern/lib_id_delete.c +++ b/source/blender/blenkernel/intern/lib_id_delete.c @@ -219,7 +219,7 @@ void BKE_id_free_us(Main *bmain, void *idv) /* test users */ * Otherwise, there is no real way to get rid of an object anymore - * better handling of this is TODO. */ - if ((GS(id->name) == ID_OB) && (id->us == 1) && (id->lib == NULL)) { + if ((GS(id->name) == ID_OB) && (id->us == 1) && !ID_IS_LINKED(id)) { id_us_clear_real(id); } |