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:
Diffstat (limited to 'intern/cycles/kernel/kernel_displace.h')
-rw-r--r--intern/cycles/kernel/kernel_displace.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_displace.h b/intern/cycles/kernel/kernel_displace.h
index 8b95e413b3f..c7fd03e7603 100644
--- a/intern/cycles/kernel/kernel_displace.h
+++ b/intern/cycles/kernel/kernel_displace.h
@@ -28,8 +28,8 @@ __device void kernel_shader_evaluate(KernelGlobals *kg, uint4 *input, float4 *ou
/* setup shader data */
int object = in.x;
int prim = in.y;
- float u = __int_as_float(in.z);
- float v = __int_as_float(in.w);
+ float u = __uint_as_float(in.z);
+ float v = __uint_as_float(in.w);
shader_setup_from_displace(kg, &sd, object, prim, u, v);
@@ -41,8 +41,8 @@ __device void kernel_shader_evaluate(KernelGlobals *kg, uint4 *input, float4 *ou
else { // SHADER_EVAL_BACKGROUND
/* setup ray */
Ray ray;
- float u = __int_as_float(in.x);
- float v = __int_as_float(in.y);
+ float u = __uint_as_float(in.x);
+ float v = __uint_as_float(in.y);
ray.P = make_float3(0.0f, 0.0f, 0.0f);
ray.D = equirectangular_to_direction(u, v);