diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-01-28 12:22:25 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-01-28 12:53:53 +0300 |
| commit | c37b83724494c4a69db712a4d149a6b1ade61d51 (patch) | |
| tree | 78af7de0840b432e7325868087628050cdeb69fe /source/blender/editors/space_outliner | |
| parent | 49b9b0251b77439b1ec6f6f1af92db131aca6d29 (diff) | |
Fix T95060: Outliner: Broken 'make override hierarchy' in indirect linked casae.
In Outliner, 'Make Override Hierarchy' on an indirectly linked data would
fail in case some items higher up in the hierarchy also needed to be
overridden was also indirectly linked.
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc index fa31025b550..03fc4c20fe5 100644 --- a/source/blender/editors/space_outliner/outliner_tools.cc +++ b/source/blender/editors/space_outliner/outliner_tools.cc @@ -859,8 +859,9 @@ static void id_override_library_create_fn(bContext *C, if (!ID_IS_LINKED(te->store_elem->id)) { break; } - /* If we'd need to override that aren't ID, but it is not overridable, abort. */ - if (!ID_IS_OVERRIDABLE_LIBRARY(te->store_elem->id)) { + /* If some element in the tree needs to be overridden, but its ID is not overridable, + * abort. */ + if (!ID_IS_OVERRIDABLE_LIBRARY_HIERARCHY(te->store_elem->id)) { BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false); BKE_reportf(reports, RPT_WARNING, |