[Bf-blender-cvs] [d544bc5] master: Cycles: Fix embarrassing type remained after getting rid of utility SWAP()

Sergey Sharybin noreply at git.blender.org
Tue Mar 3 20:17:12 CET 2015


Commit: d544bc5cd5ce3ed6e03f8532a728eeaa553d4597
Author: Sergey Sharybin
Date:   Wed Mar 4 00:16:21 2015 +0500
Branches: master
https://developer.blender.org/rBd544bc5cd5ce3ed6e03f8532a728eeaa553d4597

Cycles: Fix embarrassing type remained after getting rid of utility SWAP()

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

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 30468ef..6defa80 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -73,7 +73,7 @@ void triangle_intersect_precalc(float3 dir,
 	if(IDX(dir, kz) < 0.0f) {
 		int tmp = kx;
 		kx = ky;
-		kx = tmp;
+		ky = tmp;
 	}
 
 	/* Calculate the shear constants. */




More information about the Bf-blender-cvs mailing list