diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-01-22 08:43:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-01-22 08:43:48 +0300 |
| commit | 421c5127f499c463d9c5b2461dea2ca24887b22c (patch) | |
| tree | 697f728b888e1a4264a2900710f97b2cd9f9c43f /source/blender/editors/space_nla | |
| parent | 295b21f56a1682039244ba10466e0901a4217bd3 (diff) | |
| parent | ee5a4f41eb487c455337579643826d14326a4171 (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/space_nla')
| -rw-r--r-- | source/blender/editors/space_nla/nla_channels.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |