diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-07 03:34:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-07 03:34:47 +0400 |
commit | d58a38508469f336a4aef9632b182722758aa29b (patch) | |
tree | b20d6b9bd23405b2b47b59f8e01f3a190c6dc70a /intern/cycles/kernel/svm/svm_blackbody.h | |
parent | 3c8cdb8c6813c8ef9655054948419fb51c7af09f (diff) |
minor edits to float/double conversion suggested by DingTo
Diffstat (limited to 'intern/cycles/kernel/svm/svm_blackbody.h')
-rw-r--r-- | intern/cycles/kernel/svm/svm_blackbody.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/svm/svm_blackbody.h b/intern/cycles/kernel/svm/svm_blackbody.h index c3987f378a4..2fc2c770a83 100644 --- a/intern/cycles/kernel/svm/svm_blackbody.h +++ b/intern/cycles/kernel/svm/svm_blackbody.h @@ -42,18 +42,18 @@ __device void svm_node_blackbody(KernelGlobals *kg, ShaderData *sd, float *stack /* Input */ float temperature = stack_load_float(stack, temperature_offset); - if (temperature < (float)BB_DRAPPER) { + if (temperature < BB_DRAPPER) { /* just return very very dim red */ color_rgb = make_float3(1.0e-6f,0.0f,0.0f); } - else if (temperature <= (float)BB_MAX_TABLE_RANGE) { + else if (temperature <= BB_MAX_TABLE_RANGE) { /* This is the overall size of the table */ const int lookuptablesize = 956; const float lookuptablenormalize = 1.0f/956.0f; /* reconstruct a proper index for the table lookup, compared to OSL we don't look up two colors just one (the OSL-lerp is also automatically done for us by "lookup_table_read") */ - float t = powf((temperature - (float)BB_DRAPPER) * (float)(1.0 / BB_TABLE_SPACING), (float)(1.0 / BB_TABLE_XPOWER)); + float t = powf((temperature - BB_DRAPPER) * (1.0f / BB_TABLE_SPACING), (1.0f / BB_TABLE_XPOWER)); int blackbody_table_offset = kernel_data.blackbody.table_offset; |