Commit: 75b7a25014ca1896515af32abcccbb26a59edf74
Author: Dalai Felinto
Date: Fri Dec 16 15:53:23 2016 +0100
Branches: render-layers
https://developer.blender.org/rB75b7a25014ca1896515af32abcccbb26a59edf74
>From review: do_versions_after_linking skipped on undo
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index c63dcd3..bd0ef05 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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
