diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 11:02:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 11:10:48 +0300 |
| commit | 9636cab0098f96b9c6b6493fb7120f32d7506cd6 (patch) | |
| tree | 2d2e85d94c1d6d650dd535321473d016d9b92799 /source/blender/editors/screen | |
| parent | ae8225ba6d6d704110296023630e5b86befeb326 (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/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 2cd8ee9223f..7630f913ec1 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1381,9 +1381,10 @@ void ED_screen_set_scene(bContext *C, bScreen *screen, Scene *scene) if (screen == NULL) return; - - if (ed_screen_used(CTX_wm_manager(C), screen)) - ED_object_editmode_exit(C, EM_FREEDATA | EM_DO_UNDO); + + if (ed_screen_used(CTX_wm_manager(C), screen)) { + ED_object_editmode_exit(C, EM_FREEDATA); + } for (sc = bmain->screen.first; sc; sc = sc->id.next) { if ((U.flag & USER_SCENEGLOBAL) || sc == screen) { |