diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-31 13:30:19 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-31 13:30:19 +0300 |
| commit | f18de82cd41ad04c29ee711e7b80b13b67505493 (patch) | |
| tree | 7c49119b4d1c17a6eb81e9c8a6586dffd90320d5 /intern | |
| parent | ca73883e1985ea85db4dc50da1620f247b735c03 (diff) | |
| parent | e51f51d55dac64512fe5d54895eee37e99ff9a48 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh_local.h | 3 | ||||
| -rw-r--r-- | intern/cycles/kernel/bvh/obvh_local.h | 5 | ||||
| -rw-r--r-- | intern/cycles/kernel/bvh/qbvh_local.h | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/intern/cycles/kernel/bvh/bvh_local.h b/intern/cycles/kernel/bvh/bvh_local.h index 8def71bc890..2b02f4527bb 100644 --- a/intern/cycles/kernel/bvh/bvh_local.h +++ b/intern/cycles/kernel/bvh/bvh_local.h @@ -73,10 +73,9 @@ bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg, int object = OBJECT_NONE; float isect_t = ray->t; - if(local_isect) { + if(local_isect != NULL) { local_isect->num_hits = 0; } - kernel_assert((local_isect == NULL) == (max_hits == 0)); const int object_flag = kernel_tex_fetch(__object_flag, local_object); diff --git a/intern/cycles/kernel/bvh/obvh_local.h b/intern/cycles/kernel/bvh/obvh_local.h index 50bcfa79b6c..92143193a6a 100644 --- a/intern/cycles/kernel/bvh/obvh_local.h +++ b/intern/cycles/kernel/bvh/obvh_local.h @@ -50,7 +50,10 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(OBVH)(KernelGlobals *kg, int object = OBJECT_NONE; float isect_t = ray->t; - local_isect->num_hits = 0; + if(local_isect != NULL) { + local_isect->num_hits = 0; + } + kernel_assert((local_isect == NULL) == (max_hits == 0)); const int object_flag = kernel_tex_fetch(__object_flag, local_object); if(!(object_flag & SD_OBJECT_TRANSFORM_APPLIED)) { diff --git a/intern/cycles/kernel/bvh/qbvh_local.h b/intern/cycles/kernel/bvh/qbvh_local.h index 0dc0575556c..ee3827de309 100644 --- a/intern/cycles/kernel/bvh/qbvh_local.h +++ b/intern/cycles/kernel/bvh/qbvh_local.h @@ -59,10 +59,9 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg, int object = OBJECT_NONE; float isect_t = ray->t; - if(local_isect) { + if(local_isect != NULL) { local_isect->num_hits = 0; } - kernel_assert((local_isect == NULL) == (max_hits == 0)); const int object_flag = kernel_tex_fetch(__object_flag, local_object); |