diff options
| author | Antonis Ryakiotakis <kalast@gmail.com> | 2022-02-07 21:37:15 +0300 |
|---|---|---|
| committer | Antonis Ryakiotakis <kalast@gmail.com> | 2022-02-07 21:37:15 +0300 |
| commit | d8c05502272990173381bfd2590884bbc95aa5f5 (patch) | |
| tree | 8bd65efacbe6484b838d4550597d0f4a54ddddd9 /intern/cycles/kernel/bvh/volume_all.h | |
| parent | b64d551f3b2fa409b4eeefb641fc581eb6cd0bd6 (diff) | |
| parent | fe1816f67fbc6aaf383ec77847d668367335d093 (diff) | |
Merge branch 'master' into KTX_supportKTX_support
Diffstat (limited to 'intern/cycles/kernel/bvh/volume_all.h')
| -rw-r--r-- | intern/cycles/kernel/bvh/volume_all.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/kernel/bvh/volume_all.h b/intern/cycles/kernel/bvh/volume_all.h index a88c9d95d46..9f53e987cf1 100644 --- a/intern/cycles/kernel/bvh/volume_all.h +++ b/intern/cycles/kernel/bvh/volume_all.h @@ -147,6 +147,9 @@ ccl_device_inline kernel_tex_fetch(__prim_object, prim_addr) : object; const int prim = kernel_tex_fetch(__prim_index, prim_addr); + if (intersection_skip_self(ray->self, prim_object, prim)) { + continue; + } int object_flag = kernel_tex_fetch(__object_flag, prim_object); if ((object_flag & SD_OBJECT_HAS_VOLUME) == 0) { continue; @@ -188,6 +191,9 @@ ccl_device_inline kernel_tex_fetch(__prim_object, prim_addr) : object; const int prim = kernel_tex_fetch(__prim_index, prim_addr); + if (intersection_skip_self(ray->self, prim_object, prim)) { + continue; + } int object_flag = kernel_tex_fetch(__object_flag, prim_object); if ((object_flag & SD_OBJECT_HAS_VOLUME) == 0) { continue; |