diff options
author | Bastien Montagne <bastien@blender.org> | 2020-10-13 13:26:44 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-10-13 13:26:44 +0300 |
commit | 6b21b827048fa6e7eb5e6da007e66f2fcf248f3e (patch) | |
tree | 890cbd1cf936dc771644ac7656ec8d3f79f79a37 | |
parent | 7d5d567dba0c787f3446c5aaa1f3ffd4552a01f7 (diff) |
Fix (unreported) broken 'make override' of objects in master collection.
Master collections are not in Main list of collections, so we also need
to check the scenes.
-rw-r--r-- | source/blender/editors/object/object_relations.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 6f9a2ee9067..780ce487550 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2306,6 +2306,11 @@ static bool make_override_library_object_overridable_check(Main *bmain, Object * return true; } } + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { + if (!ID_IS_LINKED(scene) && BKE_collection_has_object(scene->master_collection, object)) { + return true; + } + } return false; } |