diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-12-13 04:47:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-13 04:47:47 +0400 |
commit | 0260e4b8a38cc567eda0679aaf7723ff442bdc34 (patch) | |
tree | cc389308b7db49d80733bcadaec28654b482649f /source/blender/editors/screen/screen_ops.c | |
parent | d6a291ca37fbe183873a62034692eab53e8d9278 (diff) |
code cleanup: quiet warnings
Diffstat (limited to 'source/blender/editors/screen/screen_ops.c')
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 269cc672e34..5a99fc7ae4c 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3595,7 +3595,7 @@ typedef struct RegionAlphaInfo { } RegionAlphaInfo; #define TIMEOUT 0.3f -#define TIMESTEP 0.04 +#define TIMESTEP 0.04f float ED_region_blend_factor(ARegion *ar) { @@ -3609,7 +3609,7 @@ float ED_region_blend_factor(ARegion *ar) alpha = (float)ar->regiontimer->duration / TIMEOUT; /* makes sure the blend out works 100% - without area redraws */ - if (rgi->hidden) alpha = 0.9 - TIMESTEP - alpha; + if (rgi->hidden) alpha = 0.9f - TIMESTEP - alpha; CLAMP(alpha, 0.0f, 1.0f); return alpha; @@ -3697,7 +3697,7 @@ static int region_blend_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *eve ED_region_tag_redraw(rgi->child_ar); /* end timer? */ - if (rgi->ar->regiontimer->duration > TIMEOUT) { + if (rgi->ar->regiontimer->duration > (double)TIMEOUT) { region_blend_end(C, rgi->ar, 0); return (OPERATOR_FINISHED | OPERATOR_PASS_THROUGH); } |