diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-10 21:17:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-10 21:17:56 +0300 |
| commit | 1b78f05b1ca466695b39d4fd60570790c1ab9e13 (patch) | |
| tree | 4c5bff1f5c6da02e87e3eb193190e4a7e5f49e8e /source/blender/editors/animation | |
| parent | d7aa51a50c65d06108a7979265226d1746d89da1 (diff) | |
| parent | f55adabb3e5d3a75ecdb30f90487e314f0afb753 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 2f9d32eadb6..4af8089ffea 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -2726,7 +2726,7 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index, /* 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_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO); + ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); } |