diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2016-12-16 17:53:23 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2016-12-16 17:53:23 +0300 |
commit | 75b7a25014ca1896515af32abcccbb26a59edf74 (patch) | |
tree | be6cdfdff43dda0230f23691eaf025576b424970 /source | |
parent | 29961ad597ce24be8c522587fa9362f84f6730fc (diff) |
From review: do_versions_after_linking skipped on undo
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c63dcd3ce51..bd0ef0529c1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -8248,7 +8248,12 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath) blo_join_main(&mainlist); lib_link_all(fd, bfd->main); - do_versions_after_linking(fd, NULL, bfd->main); + + /* skip undo case */ + if (fd->memfile == NULL) { + do_versions_after_linking(fd, NULL, 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 */ |