diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-20 11:49:14 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-20 11:49:14 +0300 |
commit | 3c524178bcbbcf3fd9b98f24409481ed061a38aa (patch) | |
tree | 8e096617b41c2b346286177757093b930d8da28a /source/blender/blenloader/intern/readfile.c | |
parent | 36773e35f6009693562330137435271922758b95 (diff) | |
parent | 88bbb68ad01bed841fad9ad26a68510f298e6f3b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index ba91dac67c4..112b97b5901 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -562,6 +562,10 @@ void blo_split_main(ListBase *mainlist, Main *main) ListBase *lbarray[MAX_LIBARRAY]; i = set_listbasepointers(main, lbarray); while (i--) { + ID *id = lbarray[i]->first; + if (id == NULL || GS(id->name) == ID_LI) { + continue; /* no ID_LI datablock should ever be linked anyway, but just in case, better be explicit. */ + } split_libdata(lbarray[i], lib_main_array, lib_main_array_len); } |