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/animation | |
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/animation')
-rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 20904ed0263..301124c4dfa 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -2720,8 +2720,9 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index, adt->flag |= ADT_UI_ACTIVE; /* ensure we exit editmode on whatever object was active before to avoid getting stuck there - T48747 */ - if (ob != sce->obedit) - ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); + if (ob != sce->obedit) { + ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR); + } notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); } |