Merge branch 'blender-v2.92-release'

2021-01-22 16:43:48 +11:00 · 2021-01-22 16:43:48 +11:00 · 421c5127f4
parent 295b21f56a ee5a4f41eb
commit 421c5127f4
1 changed files with 1 additions and 1 deletions
--- 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;