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/svm/svm_mix.h | |
parent | 43d5e54a799b6823bca31bde17606c591b81d8be (diff) |
Code cleanup: Add -Werror=float-conversion to Cycles
Diffstat (limited to 'intern/cycles/kernel/svm/svm_mix.h')
-rw-r--r-- | intern/cycles/kernel/svm/svm_mix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_mix.h b/intern/cycles/kernel/svm/svm_mix.h index 015925ab01e..edc3903865e 100644 --- a/intern/cycles/kernel/svm/svm_mix.h +++ b/intern/cycles/kernel/svm/svm_mix.h @@ -89,7 +89,7 @@ ccl_device float3 svm_mix_diff(float t, float3 col1, float3 col2) ccl_device float3 svm_mix_dark(float t, float3 col1, float3 col2) { - return min(col1, col2)*t + col1*(1.0 - t); + return min(col1, col2)*t + col1*(1.0f - t); } ccl_device float3 svm_mix_light(float t, float3 col1, float3 col2) |