diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-28 23:33:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-28 23:33:14 +0400 |
| commit | 8e3d590b76222c332d40dfeca81d899e1df5c503 (patch) | |
| tree | 84bc1ca0b6e645d463034594dd76814d9121c9f0 /source/blender/blenkernel/intern/seqeffects.c | |
| parent | 8fce915b6e6b008e89696c7ff96355d9a1f2ccf1 (diff) | |
code cleanup: python/pep8 and double-promotion warnings.
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
| -rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index b6b4501ca5a..5bae967165c 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -970,7 +970,7 @@ static void do_sub_effect_byte(float facf0, float facf1, int x, int y, unsigned tempc[2] = max_ff(rt1[2] - fac1 * rt2[2], 0.0f); tempc[3] = max_ff(rt1[3] - fac1 * rt2[3], 0.0f); - if (tempc[3] < 1e-6) + if (tempc[3] < 1e-6f) tempc[3] = 0.0f; premul_float_to_straight_uchar(rt, tempc); @@ -992,7 +992,7 @@ static void do_sub_effect_byte(float facf0, float facf1, int x, int y, unsigned tempc[2] = max_ff(rt1[2] - fac3 * rt2[2], 0.0f); tempc[3] = max_ff(rt1[3] - fac3 * rt2[3], 0.0f); - if (tempc[3] < 1e-6) + if (tempc[3] < 1e-6f) tempc[3] = 0.0f; premul_float_to_straight_uchar(rt, tempc); @@ -1024,7 +1024,7 @@ static void do_sub_effect_float(float facf0, float facf1, int x, int y, float *r rt[2] = max_ff(rt1[2] - fac1 * rt2[2], 0.0f); rt[3] = max_ff(rt1[3] - fac1 * rt2[3], 0.0f); - if (rt[3] < 1e-6) + if (rt[3] < 1e-6f) rt[3] = 0.0f; rt1 += 4; rt2 += 4; rt += 4; @@ -1041,7 +1041,7 @@ static void do_sub_effect_float(float facf0, float facf1, int x, int y, float *r rt[2] = max_ff(rt1[2] - fac3 * rt2[2], 0.0f); rt[3] = max_ff(rt1[3] - fac3 * rt2[3], 0.0f); - if (rt[3] < 1e-6) + if (rt[3] < 1e-6f) rt[3] = 0.0f; rt1 += 4; rt2 += 4; rt += 4; |