Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-15 11:02:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-15 11:10:48 +0300
commit9636cab0098f96b9c6b6493fb7120f32d7506cd6 (patch)
tree2d2e85d94c1d6d650dd535321473d016d9b92799 /source/blender/editors/mesh/editmesh_add.c
parentae8225ba6d6d704110296023630e5b86befeb326 (diff)
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.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_add.c')
-rw-r--r--source/blender/editors/mesh/editmesh_add.c4
1 files changed, 2 insertions, 2 deletions
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);
}