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:
authorCampbell Barton <ideasman42@gmail.com>2012-02-04 10:55:29 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-04 10:55:29 +0400
commitdeec4ce0bc77519f68392bc5b29ef211a31f1588 (patch)
tree81865ab303df791e61d9b50e849c53791be0ce0a /source/blender/blenkernel/intern/seqeffects.c
parenta05fdb837b89f2fba04587e99d0eecaa9cf174c3 (diff)
Code Cleanup: avoid double promotion.
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
-rw-r--r--source/blender/blenkernel/intern/seqeffects.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index a8f89b0a1eb..9edcc7a73e8 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -1583,7 +1583,7 @@ typedef struct WipeZone {
static void precalc_wipe_zone(WipeZone *wipezone, WipeVars *wipe, int xo, int yo)
{
wipezone->flip = (wipe->angle < 0);
- wipezone->angle = tan(DEG2RAD(fabsf(wipe->angle)));
+ wipezone->angle = tanf(DEG2RADF(fabsf(wipe->angle)));
wipezone->xo = xo;
wipezone->yo = yo;
wipezone->width = (int)(wipe->edgeWidth*((xo+yo)/2.0f));
@@ -1602,9 +1602,9 @@ static float in_band(float width,float dist,int side,int dir)
return (float)side;
if(side == 1)
- alpha = (dist+0.5*width) / (width);
+ alpha = (dist+0.5f*width) / (width);
else
- alpha = (0.5*width-dist) / (width);
+ alpha = (0.5f*width-dist) / (width);
if(dir == 0)
alpha = 1-alpha;