[Bf-blender-cvs] [968bf0df148] master: Fix T57811: Render crashes in certain scenes when AO Bounces are used

[Sergey Sharybin]

Commit: 968bf0df148c6fac7567860a64433daa97d042c9
Author: Sergey Sharybin
Date:   Wed Nov 21 14:17:26 2018 +0100
Branches: master
https://developer.blender.org/rB968bf0df148c6fac7567860a64433daa97d042c9

Fix T57811: Render crashes in certain scenes when AO Bounces are used

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

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 fa686d8a223..57f4c86d403 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -309,7 +309,7 @@ ccl_device_inline int ray_triangle_intersect8(
 					return 2;
 				}
 				/* If maximum number of hits reached, block all light. */
-				else if(*num_hits == max_hits) {
+				else if(num_hits == NULL || *num_hits == max_hits) {
 					return 2;
 				}
 				/* Move on to next entry in intersections array. */