diff options
Diffstat (limited to 'source/blender/blenloader/intern/undofile.c')
| -rw-r--r-- | source/blender/blenloader/intern/undofile.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/undofile.c b/source/blender/blenloader/intern/undofile.c index 95a4771b313..0bbd8c26fa1 100644 --- a/source/blender/blenloader/intern/undofile.c +++ b/source/blender/blenloader/intern/undofile.c @@ -98,6 +98,7 @@ void memfile_chunk_add(MemFile *memfile, const char *buf, uint size, MemFileChun curchunk->size = size; curchunk->buf = NULL; curchunk->is_identical = false; + curchunk->is_identical_future = false; BLI_addtail(&memfile->chunks, curchunk); /* we compare compchunk with buf */ @@ -107,6 +108,7 @@ void memfile_chunk_add(MemFile *memfile, const char *buf, uint size, MemFileChun if (memcmp(compchunk->buf, buf, size) == 0) { curchunk->buf = compchunk->buf; curchunk->is_identical = true; + compchunk->is_identical_future = true; } } *compchunk_step = compchunk->next; @@ -126,8 +128,11 @@ struct Main *BLO_memfile_main_get(struct MemFile *memfile, struct Scene **r_scene) { struct Main *bmain_undo = NULL; - BlendFileData *bfd = BLO_read_from_memfile( - oldmain, BKE_main_blendfile_path(oldmain), memfile, BLO_READ_SKIP_NONE, NULL); + BlendFileData *bfd = BLO_read_from_memfile(oldmain, + BKE_main_blendfile_path(oldmain), + memfile, + &(const struct BlendFileReadParams){0}, + NULL); if (bfd) { bmain_undo = bfd->main; |