diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-03 01:22:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-03 01:31:46 +0400 |
| commit | 8d16869d833ea2a2bd548c8f7b767dae582c78f2 (patch) | |
| tree | 8b4dac3292c5cb5c1c37211150633e6968814bc9 /intern/cycles/kernel/geom/geom_object.h | |
| parent | 43d5e54a799b6823bca31bde17606c591b81d8be (diff) | |
Code cleanup: Add -Werror=float-conversion to Cycles
Diffstat (limited to 'intern/cycles/kernel/geom/geom_object.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/geom_object.h index 431cd6321d5..de800d7cf00 100644 --- a/intern/cycles/kernel/geom/geom_object.h +++ b/intern/cycles/kernel/geom/geom_object.h @@ -364,7 +364,7 @@ ccl_device float3 particle_angular_velocity(KernelGlobals *kg, int particle) ccl_device_inline float3 bvh_clamp_direction(float3 dir) { /* clamp absolute values by exp2f(-80.0f) to avoid division by zero when calculating inverse direction */ - float ooeps = 8.271806E-25; + float ooeps = 8.271806E-25f; return make_float3((fabsf(dir.x) > ooeps)? dir.x: copysignf(ooeps, dir.x), (fabsf(dir.y) > ooeps)? dir.y: copysignf(ooeps, dir.y), (fabsf(dir.z) > ooeps)? dir.z: copysignf(ooeps, dir.z)); |