diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 19:58:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 20:22:19 +0300 |
| commit | b5372e3e3704bdf5d30faeb6aba8a92230592e65 (patch) | |
| tree | 0e6d097858d409b773155a534e971ba7467336c3 /source/blender/blenloader | |
| parent | a30bdcc142f1241a302107c637fd47be06073d76 (diff) | |
Cleanup: don't do nodetree verification/versioning twice.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index dd3ce16f3f4..ebd8d2bd06b 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9062,16 +9062,17 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath) BKE_main_id_tag_all(bfd->main, LIB_TAG_NEW, false); + /* Before static overrides, which needs typeinfo. */ + lib_verify_nodetree(bfd->main, true); + /* Now that all our data-blocks are loaded, we can re-generate overrides from their references. */ if (fd->memfile == NULL) { /* Do not apply in undo case! */ - lib_verify_nodetree(bfd->main, true); /* Needed to ensure we have typeinfo in nodes... */ BKE_main_override_static_update(bfd->main); } BKE_collections_after_lib_link(bfd->main); - lib_verify_nodetree(bfd->main, true); fix_relpaths_library(fd->relabase, bfd->main); /* make all relative paths, relative to the open blend file */ link_global(fd, bfd); /* as last */ |