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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-07 20:06:17 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-07 20:06:17 +0400
commitd835d2f4e65ae3bf8e22f8d3d60e7e6ea7a6b4ca (patch)
tree77475cb0eec4dda28415b6c9f6be51df28acf286 /intern/cycles/kernel/svm/svm_hsv.h
parentc24be7ec6e5269c54552d1fb03707b97befd48d1 (diff)
Code cleanup: avoid some warnings due to implicit uint/int/float/double conversion.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_hsv.h')
-rw-r--r--intern/cycles/kernel/svm/svm_hsv.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm_hsv.h b/intern/cycles/kernel/svm/svm_hsv.h
index 26b6141ee3f..348f13f59f2 100644
--- a/intern/cycles/kernel/svm/svm_hsv.h
+++ b/intern/cycles/kernel/svm/svm_hsv.h
@@ -77,7 +77,7 @@ __device float3 hsv_to_rgb(float3 hsv)
h = 0.0f;
h *= 6.0f;
- i = floor(h);
+ i = floorf(h);
f = h - i;
rgb = make_float3(f, f, f);
p = v*(1.0f-s);
@@ -112,7 +112,7 @@ __device void svm_node_hsv(KernelGlobals *kg, ShaderData *sd, float *stack, uint
/* remember: fmod doesn't work for negative numbers here */
color.x += hue + 0.5f;
- color.x = fmod(color.x, 1.0f);
+ color.x = fmodf(color.x, 1.0f);
color.y *= sat;
color.z *= val;