diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-06-02 09:08:43 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-06-02 09:08:43 +0300 |
| commit | a8907e409a2feea5a004912c02fcec537040cf3e (patch) | |
| tree | 531bac5d1df10e531c42f41406316d4120a7c465 /intern | |
| parent | c7280ce65b856d26d6807c1b7a081ffc6311bfdc (diff) | |
| parent | 7881c251f330e60cb9931143c46e302789f8007b (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh.h | 8 | ||||
| -rw-r--r-- | intern/cycles/util/util_guarded_allocator.h | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h index b3992c03a9a..9b9df883b62 100644 --- a/intern/cycles/kernel/bvh/bvh.h +++ b/intern/cycles/kernel/bvh/bvh.h @@ -300,7 +300,9 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg, // Is set to zero on miss or if ray is aborted, so can be used as return value uint p5 = max_hits; - local_isect->num_hits = 0; // Initialize hit count to zero + if (local_isect) { + local_isect->num_hits = 0; // Initialize hit count to zero + } optixTrace(scene_intersect_valid(ray) ? kernel_data.bvh.scene : 0, ray->P, ray->D, @@ -323,7 +325,9 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg, return p5; # else /* __KERNEL_OPTIX__ */ if (!scene_intersect_valid(ray)) { - local_isect->num_hits = 0; + if (local_isect) { + local_isect->num_hits = 0; + } return false; } diff --git a/intern/cycles/util/util_guarded_allocator.h b/intern/cycles/util/util_guarded_allocator.h index 2d09326d2ca..f78cc5f5da9 100644 --- a/intern/cycles/util/util_guarded_allocator.h +++ b/intern/cycles/util/util_guarded_allocator.h @@ -18,6 +18,7 @@ #define __UTIL_GUARDED_ALLOCATOR_H__ #include <cstddef> +#include <cstdlib> #include <memory> #ifdef WITH_BLENDER_GUARDEDALLOC |