From 2a8a56929b095fcff2cca6e87099d98141e1b420 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 2 Jan 2015 17:21:24 +0500 Subject: Cycles: Fix unneeded int/float conversion happened in previous commit --- intern/cycles/kernel/geom/geom_triangle_intersect.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h index cbb9d27aaf4..475ee50f876 100644 --- a/intern/cycles/kernel/geom/geom_triangle_intersect.h +++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h @@ -67,7 +67,7 @@ void triangle_intersect_precalc(float3 dir, /* Swap kx and ky dimensions to preserve winding direction of triangles. */ if(IDX(dir, kz) < 0.0f) { - float tmp = kx; + int tmp = kx; kx = ky; kx = tmp; } -- cgit v1.2.3