Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-11-21 16:17:26 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-11-21 16:17:26 +0300
commit968bf0df148c6fac7567860a64433daa97d042c9 (patch)
tree6b75243183113db37ee4dcd0b63ef7e15f15439d /intern/cycles/kernel
parent6f48bfc7a872c106e631cda0e23d2f61d6d944d2 (diff)
Fix T57811: Render crashes in certain scenes when AO Bounces are used
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r--intern/cycles/kernel/geom/geom_triangle_intersect.h2
1 files changed, 1 insertions, 1 deletions
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. */