From 7793d1d26f28459c477f71fcd2ee662a7e14dd04 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Fri, 8 Jul 2016 01:24:47 +1200 Subject: Fix T48747: Stuck in edit mode after selecting another object in the animation editors --- source/blender/editors/animation/anim_channels_edit.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/editors/animation') 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; } -- cgit v1.2.3