Fix T57816: Crash when deleting recently orphaned collection

We were never removing the parent collection from a collection upon removal
of the parent.

Reviewers: mont29

Differential Revision: https://developer.blender.org/D4099

diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 33287d5a2f8a0765617b0fb2aa506dc45cfa7987..a3782deecad4fdefbeb599650e89c3f35b6bca48 100644 (file)
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -683,8 +683,9 @@ static void collection_missing_parents_remove(Collection *collection)
 {
        for (CollectionParent *parent = collection->parents.first, *parent_next; parent != NULL; parent = parent_next) {
                parent_next = parent->next;
-
-               if (!collection_find_child(parent->collection, collection)) {
+               if ((parent->collection == NULL) ||
+                   !collection_find_child(parent->collection, collection))
+               {
                        BLI_freelinkN(&collection->parents, parent);
                }
        }

diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 9428e1508a44b7fb9d68de9b1513bf0a776f5af7..ab50cf8b0a8c1987574a61f07b76b2ec6360d446 100644 (file)
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -747,6 +747,9 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call
                                for (CollectionChild *child = collection->children.first; child; child = child->next) {
                                        CALLBACK_INVOKE(child->collection, IDWALK_CB_USER);
                                }
+                               for (CollectionParent *parent = collection->parents.first; parent; parent = parent->next) {
+                                       CALLBACK_INVOKE(parent->collection, IDWALK_CB_NOP);
+                               }
                                break;
                        }