diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-05-07 13:52:34 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-05-07 13:52:34 +0300 |
| commit | 2bd85d9cc6232c6fb44c8a2ceb50f45ad90ad66c (patch) | |
| tree | e38f380f4d609a5c414f7fcd2ba18c9e06958eeb /source/blender/blenkernel/intern/lib_override.c | |
| parent | 3ee49c8711ca72b03687574a98adec904ec1699c (diff) | |
LibOverride: Fix many 'obsolete' overrides not being properly deleted.
Code detecting overrides which reference linked data is missing was
actually missing many cases, leading to too much garbage data being kept
around after resync process.
Diffstat (limited to 'source/blender/blenkernel/intern/lib_override.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lib_override.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index 6c94eda2ee0..a6bb8684864 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -902,6 +902,15 @@ bool BKE_lib_override_library_resync(Main *bmain, BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, __func__); ID *id; FOREACH_MAIN_ID_BEGIN (bmain, id) { + /* IDs that get fully removed from linked data remain as local overrides (using place-holder + * linked IDs as reference), but they are often not reachable from any current valid local + * override hierarchy anymore. This will ensure they get properly deleted at the end of this + * function. */ + if (!ID_IS_LINKED(id) && ID_IS_OVERRIDE_LIBRARY_REAL(id) && + (id->override_library->reference->tag & LIB_TAG_MISSING) != 0) { + id->tag |= LIB_TAG_MISSING; + } + if (id->tag & LIB_TAG_DOIT && !ID_IS_LINKED(id) && ID_IS_OVERRIDE_LIBRARY_REAL(id)) { /* While this should not happen in typical cases (and won't be properly supported here), user * is free to do all kind of very bad things, including having different local overrides of a |