diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-04-14 07:51:20 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-04-14 09:39:05 +0300 |
| commit | c95f38b92aa2981a771c4a4c010270547becec26 (patch) | |
| tree | 92f7fc516e0b77e177a782f4cafb45986e8e764b /source/blender/editors/space_nla | |
| parent | 5361339ba0590abe2220a65efa53ca48b2813974 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/space_nla')
| -rw-r--r-- | source/blender/editors/space_nla/nla_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index 5d9a77c8576..52156a2394e 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... */ |