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/object/object_add.c | |
| parent | 55b241d32a2c3192a439c51aff99a0a248ca9ef2 (diff) | |
| parent | 9636cab0098f96b9c6b6493fb7120f32d7506cd6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object/object_add.c')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 366667163b0..b1c3c8bc59b 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -424,8 +424,9 @@ Object *ED_object_add_type( Object *ob; /* for as long scene has editmode... */ - if (CTX_data_edit_object(C)) - ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); /* freedata, and undo */ + if (CTX_data_edit_object(C)) { + ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR); + } /* deselects all, sets scene->basact */ ob = BKE_object_add(bmain, scene, view_layer, type, name); |