[Bf-blender-cvs] [f8ce417] master: Fix T40320: wrong render layer visibility with cycles deformation motion blur.

[Brecht Van Lommel]

Commit: f8ce417eba0c4b52e00f32a4b54c195cb41ecf7f
Author: Brecht Van Lommel
Date:   Fri May 23 16:10:07 2014 +0200
https://developer.blender.org/rBf8ce417eba0c4b52e00f32a4b54c195cb41ecf7f

Fix T40320: wrong render layer visibility with cycles deformation motion blur.

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

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

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

diff --git a/intern/cycles/kernel/geom/geom_motion_triangle.h b/intern/cycles/kernel/geom/geom_motion_triangle.h
index 73338bb..73fcf1a 100644
--- a/intern/cycles/kernel/geom/geom_motion_triangle.h
+++ b/intern/cycles/kernel/geom/geom_motion_triangle.h
@@ -327,14 +327,21 @@ ccl_device_inline bool motion_triangle_intersect(KernelGlobals *kg, Intersection
 	float t, u, v;
 
 	if(ray_triangle_intersect_uv(P, dir, isect->t, verts[2], verts[0], verts[1], &u, &v, &t)) {
-		isect->prim = triAddr;
-		isect->object = object;
-		isect->type = PRIMITIVE_MOTION_TRIANGLE;
-		isect->u = u;
-		isect->v = v;
-		isect->t = t;
+#ifdef __VISIBILITY_FLAG__
+		/* visibility flag test. we do it here under the assumption
+		 * that most triangles are culled by node flags */
+		if(kernel_tex_fetch(__prim_visibility, triAddr) & visibility)
+#endif
+		{
+			isect->prim = triAddr;
+			isect->object = object;
+			isect->type = PRIMITIVE_MOTION_TRIANGLE;
+			isect->u = u;
+			isect->v = v;
+			isect->t = t;
 		
-		return true;
+			return true;
+		}
 	}
 
 	return false;