diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-11-02 08:04:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-02 08:04:30 +0400 |
commit | df1f21d678dbfcefd9d0be1e6f62b979e0a8d294 (patch) | |
tree | 9faacbbf0965541cee3cf0ebdd0f49ad99576682 /source/blender/blenkernel/intern/smoke.c | |
parent | 2742cb6000443b67705e4c9bcff2d2250f7d8eb5 (diff) |
code cleanup: warnings
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index b7251a5e795..23f7dd6ccfb 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -276,21 +276,21 @@ static void smoke_set_domain_from_derivedmesh(SmokeDomainSettings *sds, Object * /* define grid resolutions from longest domain side */ if (size[0] >= MAX2(size[1], size[2])) { scale = res / size[0]; - sds->scale = size[0] / fabs(ob->size[0]); + sds->scale = size[0] / fabsf(ob->size[0]); sds->base_res[0] = res; sds->base_res[1] = (int)(size[1] * scale + 0.5f); sds->base_res[2] = (int)(size[2] * scale + 0.5f); } else if (size[1] >= MAX2(size[0], size[2])) { scale = res / size[1]; - sds->scale = size[1] / fabs(ob->size[1]); + sds->scale = size[1] / fabsf(ob->size[1]); sds->base_res[0] = (int)(size[0] * scale + 0.5f); sds->base_res[1] = res; sds->base_res[2] = (int)(size[2] * scale + 0.5f); } else { scale = res / size[2]; - sds->scale = size[2] / fabs(ob->size[2]); + sds->scale = size[2] / fabsf(ob->size[2]); sds->base_res[0] = (int)(size[0] * scale + 0.5f); sds->base_res[1] = (int)(size[1] * scale + 0.5f); sds->base_res[2] = res; @@ -1338,7 +1338,7 @@ static void emit_from_particles(Object *flow_ob, SmokeDomainSettings *sds, Smoke float hr = 1.0f / ((float)hires_multiplier); /* slightly adjust high res antialias smoothness based on number of divisions * to allow smaller details but yet not differing too much from the low res size */ - float hr_smooth = smooth * pow(hr, 1.0f/3.0f); + const float hr_smooth = smooth * powf(hr, 1.0f / 3.0f); /* setup loop bounds */ for (i = 0; i < 3; i++) { |