Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <b.mont29@gmail.com>2020-02-13 16:26:27 +0300
committerBastien Montagne <b.mont29@gmail.com>2020-02-13 18:23:42 +0300
commita1397e48b9529fe97c8801a07d0ce3daa3594f95 (patch)
treee9140f90691d00c1233be38c5714714f02f4f904 /source/blender/blenloader/intern
parentf28bb6992fa9773fb1e7918d569f4c88427f4c96 (diff)
Cleanup old special cases from some libquery callbacks.
We now have proper flagging for horrible loopback pointers...
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readfile.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b06571e5f40..93352a1ec90 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7758,6 +7758,9 @@ static int lib_link_main_data_restore_cb(LibraryIDLinkCallbackData *cb_data)
if (GS((*id_pointer)->name) == ID_GR) {
Collection *collection = (Collection *)*id_pointer;
if (collection->flag & COLLECTION_IS_MASTER) {
+ /* We should never reach that point anymore, since master collection private ID should be
+ * properly tagged with IDWALK_CB_PRIVATE. */
+ BLI_assert(0);
return IDWALK_RET_NOP;
}
}