diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-04-10 19:36:43 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-04-10 19:36:43 +0300 |
| commit | ed5507de8a25b847771e8dcc1c123ac58cad3445 (patch) | |
| tree | 6bff739fc11d40987a745cc6c4d0187765e8adae /source | |
| parent | 3bd892a74c826597ee3ce21faf385599d6c6cd86 (diff) | |
LibOverride: Fix resync bug on recursive overrides.
Linked override were not properly ignored in some part of the code,
leading to invalid resync results in some cases with recursive overrides
(i.e. overrides of overrides).
Reported by Andy @eyecandy from the studio.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/lib_override.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index eac9e760ae5..7412f6a5a0c 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -895,7 +895,7 @@ bool BKE_lib_override_library_resync(Main *bmain, BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, __func__); ID *id; FOREACH_MAIN_ID_BEGIN (bmain, id) { - if (id->tag & LIB_TAG_DOIT && ID_IS_OVERRIDE_LIBRARY_REAL(id)) { + 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 * same linked ID in a same hierarchy. */ |