From ee5a4f41eb487c455337579643826d14326a4171 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 22 Jan 2021 16:01:49 +1100 Subject: Fix the NLA setting the active object without exiting edit-mode This is done by convention in the outliner and dope-sheet. Missing edit-mode exit causes glitches with mixed object/edit-mode undo. --- source/blender/editors/space_nla/nla_channels.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/space_nla') diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index 20a330492a4..fb297672f0f 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -161,7 +161,7 @@ static int mouse_nla_channels( } /* change active object - regardless of whether it is now selected [T37883] */ - ED_object_base_activate(C, base); /* adds notifier */ + ED_object_base_activate_with_mode_exit_if_needed(C, base); /* adds notifier */ if ((adt) && (adt->flag & ADT_UI_SELECTED)) { adt->flag |= ADT_UI_ACTIVE; -- cgit v1.2.3