[Bf-blender-cvs] [7dc75ea] master: Fix T45904: Cycles bug after recent triangle intersect changes

Sergey Sharybin noreply at git.blender.org
Tue Aug 25 18:34:42 CEST 2015


Commit: 7dc75ea8f4ab90bdb67aa37f285893c92e445784
Author: Sergey Sharybin
Date:   Tue Aug 25 18:19:03 2015 +0200
Branches: master
https://developer.blender.org/rB7dc75ea8f4ab90bdb67aa37f285893c92e445784

Fix T45904: Cycles bug after recent triangle intersect changes

Calculated cross product from wrong vectors by accident.

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

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 7ca046f..8803866 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -173,7 +173,7 @@ ccl_device_inline bool triangle_intersect(KernelGlobals *kg,
 	if(kernel_tex_fetch(__prim_visibility, triAddr) & visibility)
 #endif
 	{
-		if(len_squared(cross(tri_a, tri_b)) < 1e-14f) {
+		if(len_squared(cross(A, B)) < 1e-12f) {
 			return false;
 		}
 		/* Normalize U, V, W, and T. */




More information about the Bf-blender-cvs mailing list