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>2014-05-03 01:22:14 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-05-03 01:31:46 +0400
commit8d16869d833ea2a2bd548c8f7b767dae582c78f2 (patch)
tree8b4dac3292c5cb5c1c37211150633e6968814bc9 /intern/cycles/kernel/kernel_volume.h
parent43d5e54a799b6823bca31bde17606c591b81d8be (diff)
Code cleanup: Add -Werror=float-conversion to Cycles
Diffstat (limited to 'intern/cycles/kernel/kernel_volume.h')
-rw-r--r--intern/cycles/kernel/kernel_volume.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index b3c97cfac7f..faaa68e3309 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -203,7 +203,7 @@ ccl_device float kernel_volume_equiangular_sample(Ray *ray, float3 light_P, floa
float D = sqrtf(len_squared(light_P - ray->P) - delta * delta);
float theta_a = -atan2f(delta, D);
float theta_b = atan2f(t - delta, D);
- float t_ = D * tan((xi * theta_b) + (1 - xi) * theta_a);
+ float t_ = D * tanf((xi * theta_b) + (1 - xi) * theta_a);
*pdf = D / ((theta_b - theta_a) * (D * D + t_ * t_));