diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-06 10:36:50 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-06 10:36:50 +0300 |
| commit | bfbd85e9d66be3793e51ef989f793bdd69214493 (patch) | |
| tree | 8c986be07cbf1072253eb9dfacbbd0da7b3baa30 /source/blender | |
| parent | 713027b83252aadb7e583353637aed9f8284acad (diff) | |
Fix error using freed bmain
Regression in 481cdb08ed6f3
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/blender_undo.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/blender_undo.c b/source/blender/blenkernel/intern/blender_undo.c index c3306b16041..df2caba0208 100644 --- a/source/blender/blenkernel/intern/blender_undo.c +++ b/source/blender/blenkernel/intern/blender_undo.c @@ -82,13 +82,14 @@ bool BKE_memfile_undo_decode(MemFileUndoData *mfu, bContext *C) success = BKE_blendfile_read_from_memfile(C, &mfu->memfile, NULL, 0); } - /* restore */ - BLI_strncpy(bmain->name, mainstr, sizeof(bmain->name)); /* restore */ + /* Restore, bmain has been re-allocated. */ + bmain = CTX_data_main(C); + BLI_strncpy(bmain->name, mainstr, sizeof(bmain->name)); G.fileflags = fileflags; if (success) { /* important not to update time here, else non keyed tranforms are lost */ - DAG_on_visible_update(G.main, false); + DAG_on_visible_update(bmain, false); } return success; |