From 9636cab0098f96b9c6b6493fb7120f32d7506cd6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 15 May 2018 10:02:01 +0200 Subject: Undo System: remove nested edit-mode undo calls Regression in recent undo system changes, This caused T55048. When each mode had its own undo stack it was important to initialize it when entering edit-mode. --- source/blender/editors/mesh/editmesh_add.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/mesh/editmesh_add.c') diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 22cb28f0b1b..9bea203e67b 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -72,7 +72,7 @@ static Object *make_prim_init( obedit = ED_object_add_type(C, OB_MESH, idname, loc, rot, false, layer); /* create editmode */ - ED_object_editmode_enter(C, EM_DO_UNDO | EM_IGNORE_LAYER); /* rare cases the active layer is messed up */ + ED_object_editmode_enter(C, EM_IGNORE_LAYER); /* rare cases the active layer is messed up */ *was_editmode = true; } @@ -95,7 +95,7 @@ static void make_prim_finish(bContext *C, Object *obedit, bool was_editmode, int /* userdef */ if (exit_editmode) { - ED_object_editmode_exit(C, EM_FREEDATA); /* adding EM_DO_UNDO messes up operator redo */ + ED_object_editmode_exit(C, EM_FREEDATA); } WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, obedit); } -- cgit v1.2.3