diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-24 13:26:12 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-24 13:26:12 +0300 |
commit | 48997d2e40a74a83fb9edfb9de0999139392f634 (patch) | |
tree | bb968328b736dd1f9f5433061d8cfbd10fb6ef9b /intern/cycles/kernel/svm | |
parent | 3f292596769d699c8347be075a6d4bff8fffd556 (diff) |
Cycles: Cleanup, style
Diffstat (limited to 'intern/cycles/kernel/svm')
-rw-r--r-- | intern/cycles/kernel/svm/svm_ramp_util.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/intern/cycles/kernel/svm/svm_ramp_util.h b/intern/cycles/kernel/svm/svm_ramp_util.h index 9f2ce1276f9..b0adadae9b7 100644 --- a/intern/cycles/kernel/svm/svm_ramp_util.h +++ b/intern/cycles/kernel/svm/svm_ramp_util.h @@ -27,9 +27,9 @@ ccl_device_inline float3 rgb_ramp_lookup(const float3 *ramp, bool extrapolate, int table_size) { - if ((f < 0.0f || f > 1.0f) && extrapolate) { + if((f < 0.0f || f > 1.0f) && extrapolate) { float3 t0, dy; - if (f < 0.0f) { + if(f < 0.0f) { t0 = ramp[0]; dy = t0 - ramp[1], f = -f; @@ -50,8 +50,9 @@ ccl_device_inline float3 rgb_ramp_lookup(const float3 *ramp, float3 result = ramp[i]; - if (interpolate && t > 0.0f) + if(interpolate && t > 0.0f) { result = (1.0f - t) * result + t * ramp[i + 1]; + } return result; } @@ -62,9 +63,9 @@ ccl_device float float_ramp_lookup(const float *ramp, bool extrapolate, int table_size) { - if ((f < 0.0f || f > 1.0f) && extrapolate) { + if((f < 0.0f || f > 1.0f) && extrapolate) { float t0, dy; - if (f < 0.0f) { + if(f < 0.0f) { t0 = ramp[0]; dy = t0 - ramp[1], f = -f; @@ -85,8 +86,9 @@ ccl_device float float_ramp_lookup(const float *ramp, float result = ramp[i]; - if (interpolate && t > 0.0f) + if(interpolate && t > 0.0f) { result = (1.0f - t) * result + t * ramp[i + 1]; + } return result; } |