diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-11-04 16:46:48 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-11-04 16:46:48 +0400 |
| commit | 9bdfa2f9e7f6c71a58b5e7875f27971768acc0e1 (patch) | |
| tree | d682cc7afbd5947466853e74171680c3ddc65364 /source/blender/editors/space_nla | |
| parent | dd8e83606776d1d3c51cd8f5c89bf6d1a7e05f74 (diff) | |
| parent | 2a8ce1f12162593ad9c1db3422d35530c5d05dc2 (diff) | |
Merged changes in the trunk up to revision 51863.
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 9091699bd4b..fd999bf2476 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -775,7 +775,7 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View glColor3fv(color); } else { - float alpha = (adt && (adt->flag & ADT_NLA_SOLO_TRACK)) ? 0.3 : 1.0f; + float alpha = (adt && (adt->flag & ADT_NLA_SOLO_TRACK)) ? 0.3f : 1.0f; glColor4f(color[0], color[1], color[2], alpha); } |