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:
authorThomas Dinges <blender@dingto.org>2013-06-09 19:09:15 +0400
committerThomas Dinges <blender@dingto.org>2013-06-09 19:09:15 +0400
commit49115b4dd38443c77b18f0b627a97f60975ada1d (patch)
tree6d840d93b316667017576ef079dc1c91eaaf2ed3 /intern/cycles/kernel/closure
parentb2c81664ae6f2535ebb114e94fed6449d0697ec7 (diff)
Cycles:
* Use float_to_int() functions in a few more places.
Diffstat (limited to 'intern/cycles/kernel/closure')
-rw-r--r--intern/cycles/kernel/closure/bsdf_diffuse_ramp.h2
-rw-r--r--intern/cycles/kernel/closure/bsdf_phong_ramp.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
index 8a09979806a..579145bdd80 100644
--- a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
+++ b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
@@ -40,7 +40,7 @@ __device float3 bsdf_diffuse_ramp_get_color(const ShaderClosure *sc, const float
int MAXCOLORS = 8;
float npos = pos * (float)(MAXCOLORS - 1);
- int ipos = (int)npos;
+ int ipos = float_to_int(npos);
if (ipos >= (MAXCOLORS - 1))
return colors[MAXCOLORS - 1];
float offset = npos - (float)ipos;
diff --git a/intern/cycles/kernel/closure/bsdf_phong_ramp.h b/intern/cycles/kernel/closure/bsdf_phong_ramp.h
index e518f3675c8..b51d41486c7 100644
--- a/intern/cycles/kernel/closure/bsdf_phong_ramp.h
+++ b/intern/cycles/kernel/closure/bsdf_phong_ramp.h
@@ -40,7 +40,7 @@ __device float3 bsdf_phong_ramp_get_color(const ShaderClosure *sc, const float3
int MAXCOLORS = 8;
float npos = pos * (float)(MAXCOLORS - 1);
- int ipos = (int)npos;
+ int ipos = float_to_int(npos);
if (ipos >= (MAXCOLORS - 1))
return colors[MAXCOLORS - 1];
float offset = npos - (float)ipos;