[Bf-blender-cvs] [ba99e09] master: Fix T47472: Border select in the Action Editor does not respect NLA scaling on Summary Tracks

[Joshua Leung]

Commit: ba99e097f7cea20a2f2e027c00b0abb6df8639f8
Author: Joshua Leung
Date:   Sat Feb 20 02:53:08 2016 +1300
Branches: master
https://developer.blender.org/rBba99e097f7cea20a2f2e027c00b0abb6df8639f8

Fix T47472: Border select in the Action Editor does not respect NLA scaling on Summary Tracks

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

M	source/blender/editors/space_action/action_select.c

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

diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c
index 574d3f6..f2813b2 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;
 			}