[Bf-blender-cvs] [c95f38b] master: Fix for another NLA drawing bug uncovered by the previous commit

[Joshua Leung]

Commit: c95f38b92aa2981a771c4a4c010270547becec26
Author: Joshua Leung
Date:   Tue Apr 14 16:51:20 2015 +1200
Branches: master
https://developer.blender.org/rBc95f38b92aa2981a771c4a4c010270547becec26

Fix for another NLA drawing bug uncovered by the previous commit

With multiple strips in tweakmode, only the one tagged as being "active"
would get drawn in the correct colours, while all the others would just
get drawn as a selected strip instead.

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

M	source/blender/editors/space_nla/nla_draw.c

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

diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index 5d9a77c..52156a2 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -186,7 +186,7 @@ static void nla_strip_get_color_inside(AnimData *adt, NlaStrip *strip, float col
 	}
 	else {
 		/* Action Clip (default/normal type of strip) */
-		if ((strip->flag & NLASTRIP_FLAG_ACTIVE) && (adt && (adt->flag & ADT_NLA_EDIT_ON))) {
+		if (adt && (adt->flag & ADT_NLA_EDIT_ON) && (adt->actstrip == strip)) {
 			/* active strip should be drawn green when it is acting as the tweaking strip.
 			 * however, this case should be skipped for when not in EditMode...
 			 */