Commit: 6b21b827048fa6e7eb5e6da007e66f2fcf248f3e
Author: Bastien Montagne
Date: Tue Oct 13 12:26:44 2020 +0200
Branches: master
https://developer.blender.org/rB6b21b827048fa6e7eb5e6da007e66f2fcf248f3e
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.
===================================================================
M 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;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
