diff options
| author | Joshua Leung <aligorith@gmail.com> | 2016-02-19 16:53:08 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2016-02-19 16:54:43 +0300 |
| commit | ba99e097f7cea20a2f2e027c00b0abb6df8639f8 (patch) | |
| tree | 433a9721a949d2024daf01df295825ef73b6cab6 /source/blender/editors/space_action | |
| parent | 4e3513160993aa9561ab43ab2d84aef3b9623733 (diff) | |
Fix T47472: Border select in the Action Editor does not respect NLA scaling on Summary Tracks
Diffstat (limited to 'source/blender/editors/space_action')
| -rw-r--r-- | source/blender/editors/space_action/action_select.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 574d3f6f2c9..f2813b2a8d3 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -244,10 +244,12 @@ static void borderselect_action(bAnimContext *ac, const rcti rect, short mode, s if (ELEM(mode, ACTKEYS_BORDERSEL_FRAMERANGE, ACTKEYS_BORDERSEL_ALLKEYS)) { /* if channel is mapped in NLA, apply correction */ if (adt) { + ked.iterflags &= ~(KED_F1_NLA_UNMAP | KED_F2_NLA_UNMAP); ked.f1 = BKE_nla_tweakedit_remap(adt, rectf.xmin, NLATIME_CONVERT_UNMAP); ked.f2 = BKE_nla_tweakedit_remap(adt, rectf.xmax, NLATIME_CONVERT_UNMAP); } else { + ked.iterflags |= (KED_F1_NLA_UNMAP | KED_F2_NLA_UNMAP); /* for summary tracks */ ked.f1 = rectf.xmin; ked.f2 = rectf.xmax; } |