From 32d2bc0a5963d5cc6d8810548565e2526d78dd01 Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Tue, 24 Jun 2025 09:53:06 +0200 Subject: [PATCH] Fix #139277: box selecting on the summary line fails with NLA in tweak mode The issue was that the summary channel was marked as possible to do NLA mapping in `ANIM_nla_mapping_allowed`. When it comes to doing the actual mapping it would silently do nothing though because `bAnimListElem.adt` is always a `nullptr` for the summary. However in `action_select.cc:580` the `KED_F1_NLA_UNMAP` and `KED_F2_NLA_UNMAP` flags were already removed. Those flags tell the summary line to do NLA mapping in `keyframes_edit.cc:368`. (We may be able to remove those in the future) The fix is to ensure that the summary line is recognized as unable to do NLA mapping. That makes sense to me at least because the summary line points to data but in itself does not know about the NLA. As a side effect, this also fixes circle select. Pull Request: https://projects.blender.org/blender/blender/pulls/140664 --- source/blender/editors/animation/anim_draw.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/blender/editors/animation/anim_draw.cc b/source/blender/editors/animation/anim_draw.cc index 980344cbfaf..a8987653f55 100644 --- a/source/blender/editors/animation/anim_draw.cc +++ b/source/blender/editors/animation/anim_draw.cc @@ -249,6 +249,9 @@ bool ANIM_nla_mapping_allowed(const bAnimListElem *ale) case ANIMTYPE_MASKLAYER: /* I (Sybren) don't _think_ masks can use the NLA. */ return false; + case ANIMTYPE_SUMMARY: + /* The summary line cannot do NLA remapping since it may contain multiple actions. */ + return false; default: /* NLA time remapping is the default behavior, and only should be * prohibited for the above types. */