From 6b21b827048fa6e7eb5e6da007e66f2fcf248f3e Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 13 Oct 2020 12:26:44 +0200 Subject: 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. --- source/blender/editors/object/object_relations.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source/blender/editors/object/object_relations.c') 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; } -- cgit v1.2.3