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>2013-08-06 10:36:34 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-08-06 10:36:34 +0400
commit34c64b8ea33236ae5b1fd3720defc73d08710e29 (patch)
tree7cd74761cfea213e7d78fe6788e4684cd39abfed /intern/cycles/kernel/svm/svm_blackbody.h
parentbff75bafbd7608d5c9c79f51d2941a3c1b9d51bf (diff)
cycles builds with -Wdouble-promotion again.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_blackbody.h')
-rw-r--r--intern/cycles/kernel/svm/svm_blackbody.h6
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 3c6e11ca683..c3987f378a4 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 < BB_DRAPPER) {
+ if (temperature < (float)BB_DRAPPER) {
/* just return very very dim red */
color_rgb = make_float3(1.0e-6f,0.0f,0.0f);
}
- else if (temperature <= BB_MAX_TABLE_RANGE) {
+ else if (temperature <= (float)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 - BB_DRAPPER) * (1.0f / BB_TABLE_SPACING), 1.0f/BB_TABLE_XPOWER);
+ float t = powf((temperature - (float)BB_DRAPPER) * (float)(1.0 / BB_TABLE_SPACING), (float)(1.0 / BB_TABLE_XPOWER));
int blackbody_table_offset = kernel_data.blackbody.table_offset;