[Bf-blender-cvs] [2a8a569] master: Cycles: Fix unneeded int/float conversion happened in previous commit

[Sergey Sharybin]

Commit: 2a8a56929b095fcff2cca6e87099d98141e1b420
Author: Sergey Sharybin
Date:   Fri Jan 2 17:21:24 2015 +0500
Branches: master
https://developer.blender.org/rB2a8a56929b095fcff2cca6e87099d98141e1b420

Cycles: Fix unneeded int/float conversion happened in previous commit

===================================================================

M	intern/cycles/kernel/geom/geom_triangle_intersect.h

===================================================================

diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index cbb9d27..475ee50 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;
 	}