From 946c70e6a7892985289bf8dfaead8512d33eba79 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 3 Feb 2022 15:34:56 +0100 Subject: Fix (unreported) broken do_version of hidden layers from pre-2.8 files. `BKE_collection_object_add` ensures given object is added to an editable collection, and not e.g. a linked or override one. However, some processes like do_version manipulate collections also from libraries, i.e. linked collections, in those cases we need a version of the code that unconditionnally adds the given object to the given colleciton. --- source/blender/blenloader/intern/versioning_280.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenloader/intern') diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index ceddc451a46..57105ca5884 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -349,7 +349,7 @@ static void do_version_scene_collection_convert( LISTBASE_FOREACH (LinkData *, link, &sc->objects) { Object *ob = link->data; if (ob) { - BKE_collection_object_add(bmain, collection, ob); + BKE_collection_object_add_notest(bmain, collection, ob); id_us_min(&ob->id); } } @@ -459,7 +459,7 @@ static void do_version_layers_to_collections(Main *bmain, Scene *scene) /* Note usually this would do slow collection syncing for view layers, * but since no view layers exists yet at this point it's fast. */ - BKE_collection_object_add(bmain, collections[layer], base->object); + BKE_collection_object_add_notest(bmain, collections[layer], base->object); } if (base->flag & SELECT) { @@ -1235,7 +1235,7 @@ void do_versions_after_linking_280(Main *bmain, ReportList *UNUSED(reports)) (*collection_hidden)->flag |= COLLECTION_HIDE_VIEWPORT | COLLECTION_HIDE_RENDER; } - BKE_collection_object_add(bmain, *collection_hidden, ob); + BKE_collection_object_add_notest(bmain, *collection_hidden, ob); BKE_collection_object_remove(bmain, collection, ob, true); } } -- cgit v1.2.3