diff options
| author | Joshua Leung <aligorith@gmail.com> | 2016-07-07 16:24:47 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2016-07-07 16:49:26 +0300 |
| commit | 7793d1d26f28459c477f71fcd2ee662a7e14dd04 (patch) | |
| tree | bc0c04920101f0e0c6a1b2b78e6b76d0c99068fb /source/blender/editors/animation | |
| parent | 7f03c9de7e9dbb0fc6be8f360e51aba9d47f2853 (diff) | |
Fix T48747: Stuck in edit mode after selecting another object in the animation editors
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 838e23b6091..af9b0a176f5 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -2705,6 +2705,10 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index, if ((adt) && (adt->flag & ADT_UI_SELECTED)) 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_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO); + notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); break; } |