[Bf-blender-cvs] [ee5a4f41eb4] blender-v2.92-release: Fix the NLA setting the active object without exiting edit-mode

[Campbell Barton]

Commit: ee5a4f41eb487c455337579643826d14326a4171
Author: Campbell Barton
Date:   Fri Jan 22 16:01:49 2021 +1100
Branches: blender-v2.92-release
https://developer.blender.org/rBee5a4f41eb487c455337579643826d14326a4171

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.

===================================================================

M	source/blender/editors/space_nla/nla_channels.c

===================================================================

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;