diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 13:33:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 13:36:50 +0300 |
| commit | 0b9a65151d9fc0c7e4ec273da7e4bcc3b09a6d18 (patch) | |
| tree | bdc5b9ee056ae87ad020e81994c1a9392db9e31a /source/blender/editors/undo | |
| parent | e375685e06d0b4c52a0aacb8982684e45b490d5c (diff) | |
Fix T60410: Crash adjusting torus w/ enter edit-mode preference
Diffstat (limited to 'source/blender/editors/undo')
| -rw-r--r-- | source/blender/editors/undo/memfile_undo.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c index 2470acef9aa..1560c414c42 100644 --- a/source/blender/editors/undo/memfile_undo.c +++ b/source/blender/editors/undo/memfile_undo.c @@ -38,8 +38,7 @@ #include "ED_object.h" #include "ED_undo.h" -#include "ED_render.h" - +#include "ED_util.h" #include "../blenloader/BLO_undofile.h" @@ -82,6 +81,9 @@ static bool memfile_undosys_step_encode(struct bContext *C, UndoStep *us_p) static void memfile_undosys_step_decode(struct bContext *C, UndoStep *us_p, int UNUSED(dir)) { + struct Main *bmain = CTX_data_main(C); + ED_editors_exit(bmain, false); + MemFileUndoStep *us = (MemFileUndoStep *)us_p; BKE_memfile_undo_decode(us->data, C); |