Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.83-release'

Browse Source
This commit is contained in:
Brecht Van Lommel
2020-06-02 08:08:43 +02:00
parent c7280ce65b 7881c251f3
commit a8907e409a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/kernel/bvh/bvh.h
View File

@@ -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 // Is set to zero on miss or if ray is aborted, so can be used as return value
uint p5 = max_hits; 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, optixTrace(scene_intersect_valid(ray) ? kernel_data.bvh.scene : 0,
ray->P, ray->P,
ray->D, ray->D,
@@ -323,7 +325,9 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg,
return p5; return p5;
# else /* __KERNEL_OPTIX__ */ # else /* __KERNEL_OPTIX__ */
if (!scene_intersect_valid(ray)) { if (!scene_intersect_valid(ray)) {
local_isect->num_hits = 0; if (local_isect) {
local_isect->num_hits = 0;
}
return false; return false;
} }

1
intern/cycles/util/util_guarded_allocator.h
View File

@@ -18,6 +18,7 @@
#define __UTIL_GUARDED_ALLOCATOR_H__ #define __UTIL_GUARDED_ALLOCATOR_H__
#include <cstddef> #include <cstddef>
#include <cstdlib>
#include <memory> #include <memory>
#ifdef WITH_BLENDER_GUARDEDALLOC #ifdef WITH_BLENDER_GUARDEDALLOC