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/blenkernel/intern/blender_undo.c | |
| parent | 1844ccd5210bf0c57c97b550fd38c2dc141cfb62 (diff) | |
| parent | c66570f519fb24e0c3fb724d7b6d38f4b6fd7ffc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/blender_undo.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blender_undo.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/blender_undo.c b/source/blender/blenkernel/intern/blender_undo.c index a00ad5ff05f..fac3685f7b1 100644 --- a/source/blender/blenkernel/intern/blender_undo.c +++ b/source/blender/blenkernel/intern/blender_undo.c @@ -55,6 +55,7 @@ #include "BKE_main.h" #include "BLO_undofile.h" +#include "BLO_readfile.h" #include "BLO_writefile.h" #include "DEG_depsgraph.h" @@ -81,7 +82,10 @@ bool BKE_memfile_undo_decode(MemFileUndoData *mfu, bContext *C) success = (BKE_blendfile_read(C, mfu->filename, NULL, 0) != BKE_BLENDFILE_READ_FAIL); } else { - success = BKE_blendfile_read_from_memfile(C, &mfu->memfile, NULL, 0); + success = BKE_blendfile_read_from_memfile( + C, &mfu->memfile, + &(const struct BlendFileReadParams){0}, + NULL); } /* Restore, bmain has been re-allocated. */ |