diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-22 07:16:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-22 07:16:45 +0300 |
commit | 4b9d242be53203dfa6dc8cd86aef79cce24bc00a (patch) | |
tree | d772c35aedf986633f16c6bdc5312278f58cb36d /source/blender/blenloader/intern/undofile.c | |
parent | 1844ccd5210bf0c57c97b550fd38c2dc141cfb62 (diff) | |
parent | c66570f519fb24e0c3fb724d7b6d38f4b6fd7ffc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader/intern/undofile.c')
-rw-r--r-- | source/blender/blenloader/intern/undofile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/undofile.c b/source/blender/blenloader/intern/undofile.c index b38259f0f98..5ceab1ca2cc 100644 --- a/source/blender/blenloader/intern/undofile.c +++ b/source/blender/blenloader/intern/undofile.c @@ -131,7 +131,7 @@ void memfile_chunk_add( struct Main *BLO_memfile_main_get(struct MemFile *memfile, struct Main *oldmain, struct Scene **r_scene) { struct Main *bmain_undo = NULL; - BlendFileData *bfd = BLO_read_from_memfile(oldmain, BKE_main_blendfile_path(oldmain), memfile, NULL, BLO_READ_SKIP_NONE); + BlendFileData *bfd = BLO_read_from_memfile(oldmain, BKE_main_blendfile_path(oldmain), memfile, BLO_READ_SKIP_NONE, NULL); if (bfd) { bmain_undo = bfd->main; |