diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-24 13:01:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-24 13:02:56 +0300 |
| commit | cb3c9cba49290bf12116033a7ea151cad352cf76 (patch) | |
| tree | 455bf7d776fa93c5c78f614ed87855a51306efea /source/blender/blenloader/intern/readfile.c | |
| parent | 8766ab7526fd6ec8d5b48a62a3e519bacaddc102 (diff) | |
Fix T55171: crash with undo and linked collections.
Collections created in library file versioning need to be set as coming
from the library, otherwise they get freed on undo.
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 70c898a374e..f0c6d314c26 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5717,7 +5717,6 @@ static void lib_link_collection_data(FileData *fd, Library *lib, Collection *col cob->ob = newlibadr_us(fd, lib, cob->ob); if (cob->ob == NULL) { - BLI_assert(!"Collection linked object got lost"); // TODO: remove, only for testing now BLI_freelinkN(&collection->gobject, cob); } } @@ -5729,7 +5728,6 @@ static void lib_link_collection_data(FileData *fd, Library *lib, Collection *col if (child->collection == NULL || BKE_collection_find_cycle(collection, child->collection)) { - BLI_assert(!"Collection child got lost"); // TODO: remove, only for testing now BLI_freelinkN(&collection->children, child); } else { |