diff options
author | Bastien Montagne <bastien@blender.org> | 2020-11-12 13:51:25 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-11-12 13:51:25 +0300 |
commit | 5db114ae0f3b1235ca9ca5145c0ebea99e131b76 (patch) | |
tree | b51c49c289a1ad90202f2dc914d9b9e855ba3093 /source/blender/blenkernel | |
parent | 0d04bcd566a8ec62591621a908076f417b717b3d (diff) | |
parent | 9067cd64a5083c214fd37fd65bea374312abad10 (diff) |
Merge branch 'blender-v2.91-release' into master
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/lib_id.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index cf9fff811ce..21a77e2b45a 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -1893,7 +1893,9 @@ void BKE_library_make_local(Main *bmain, if (id->lib == NULL) { id->tag &= ~(LIB_TAG_EXTERN | LIB_TAG_INDIRECT | LIB_TAG_NEW); id->flag &= ~LIB_INDIRECT_WEAK_LINK; - if (ID_IS_OVERRIDE_LIBRARY_REAL(id)) { + if (ID_IS_OVERRIDE_LIBRARY_REAL(id) && + ELEM(lib, NULL, id->override_library->reference->lib) && + ((untagged_only == false) || !(id->tag & LIB_TAG_PRE_EXISTING))) { BKE_lib_override_library_free(&id->override_library, true); } } |