diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-08-06 10:19:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-06 10:19:01 +0300 |
commit | 6158f56f524c5000324903bfa3f1f5c43b22317b (patch) | |
tree | ef1f1377ac7214f38f9376557d4e63eb93db87de /source/blender | |
parent | 14dc1aecf0e3dfb4abf8dc1ebfa4494df99b9e01 (diff) | |
parent | d4804f00fbbd6da311c49b2ae498a4cadf9efe92 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 5411657976e..435c96711bd 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6093,6 +6093,14 @@ static bool scene_validate_setscene__liblink(Scene *sce, const int totscene) } for (a = 0, sce_iter = sce; sce_iter->set; sce_iter = sce_iter->set, a++) { + /* This runs per library (before each libraries #Main has been joined), + * so we can't step into other libraries since `totscene` is only for this library. + * + * Also, other libraries may not have been linked yet, + * while we could check #LIB_TAG_NEED_LINK the library pointer check is sufficient. */ + if (sce->id.lib != sce_iter->id.lib) { + return true; + } if (sce_iter->flag & SCE_READFILE_LIBLINK_NEED_SETSCENE_CHECK) { return true; } |