diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 11:25:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 11:25:49 +0300 |
| commit | f1bc8991461fcda33eb34820bd3aa153f6122c5b (patch) | |
| tree | f6e2c533feeff8a9cf0ff36aef8035e95a5e0f0b /source/blender/editors/mesh/editmesh_add.c | |
| parent | 55b241d32a2c3192a439c51aff99a0a248ca9ef2 (diff) | |
| parent | 9636cab0098f96b9c6b6493fb7120f32d7506cd6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/mesh/editmesh_add.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_add.c | 4 |
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 292b28c772c..66ad057e3ec 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -77,7 +77,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 */ r_creation_data->was_editmode = true; } @@ -100,7 +100,7 @@ static void make_prim_finish(bContext *C, Object *obedit, const MakePrimitiveDat /* 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); } |