archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix error using freed bmain

Browse Source 
Regression in 481cdb08ed
This commit is contained in:
Campbell Barton
2018-06-06 09:36:50 +02:00
parent 713027b832
commit bfbd85e9d6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/blender_undo.c
View File

@@ -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;