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/animation/anim_channels_edit.c | |
| parent | 55b241d32a2c3192a439c51aff99a0a248ca9ef2 (diff) | |
| parent | 9636cab0098f96b9c6b6493fb7120f32d7506cd6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/animation/anim_channels_edit.c')
| -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 36402b82cbf..0163a7f68d6 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -2725,8 +2725,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 != CTX_data_edit_object(C)) - ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); + if (ob != CTX_data_edit_object(C)) { + ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR); + } notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); } |