Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2017-04-16 20:44:34 +0300
committerMike Erwin <significant.bit@gmail.com>2017-04-16 20:44:34 +0300
commitaf61b5eb0c1bef93e8df1434b174944e2b40445d (patch)
treedad7dbe831385f038af54037fb21b9655248288a /source/blender/editors/space_nla
parentae071305404e61f696f3da46b00bf93aa6a4a5a5 (diff)
cleanup use of immUniformColor
- use best function for the job - don't specify alpha if 100% - 'f' for floating point literals
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r--source/blender/editors/space_nla/nla_draw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index 576e3eb2d60..1898ee41c40 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -286,7 +286,7 @@ static void nla_strip_get_color_inside(AnimData *adt, NlaStrip *strip, float col
/* helper call for drawing influence/time control curves for a given NLA-strip */
static void nla_draw_strip_curves(NlaStrip *strip, float yminc, float ymaxc, unsigned int pos)
{
- immUniformColor4f(0.7f, 0.7f, 0.7f, 1.0f);
+ immUniformColor3f(0.7f, 0.7f, 0.7f);
const float yheight = ymaxc - yminc;
@@ -674,7 +674,7 @@ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar)
/* draw 'embossed' lines above and below the strip for effect */
/* white base-lines */
glLineWidth(2.0f);
- immUniformColor4f(1.0f, 1.0f, 1.0f, 0.3);
+ immUniformColor4f(1.0f, 1.0f, 1.0f, 0.3f);
immBegin(PRIM_LINES, 4);
immVertex2f(pos, v2d->cur.xmin, yminc + NLACHANNEL_SKIP);
immVertex2f(pos, v2d->cur.xmax, yminc + NLACHANNEL_SKIP);