diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-10-15 16:31:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-15 16:42:44 +0300 |
| commit | 53f25df5bcc59dbaee085d3a319df2a685b67d1a (patch) | |
| tree | cb58bb7c64412707b53f16cf8792fb69c6ee10d9 /intern/cycles/kernel/bvh | |
| parent | f834939cebc7c608939d73c5a17a2aaea320c85e (diff) | |
Fix T92128: Cycles CUDA wrong hair attributes, after recent changes
Diffstat (limited to 'intern/cycles/kernel/bvh')
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh_shadow_all.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh_traversal.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/kernel/bvh/bvh_shadow_all.h b/intern/cycles/kernel/bvh/bvh_shadow_all.h index c67c820edbc..ea1ee26b863 100644 --- a/intern/cycles/kernel/bvh/bvh_shadow_all.h +++ b/intern/cycles/kernel/bvh/bvh_shadow_all.h @@ -171,7 +171,9 @@ ccl_device_inline } } - const int curve_object = kernel_tex_fetch(__prim_object, prim_addr); + const int curve_object = (object == OBJECT_NONE) ? + kernel_tex_fetch(__prim_object, prim_addr) : + object; const int curve_type = kernel_tex_fetch(__prim_type, prim_addr); const int curve_prim = kernel_tex_fetch(__prim_index, prim_addr); hit = curve_intersect( diff --git a/intern/cycles/kernel/bvh/bvh_traversal.h b/intern/cycles/kernel/bvh/bvh_traversal.h index a46c45d3529..9f271a4730c 100644 --- a/intern/cycles/kernel/bvh/bvh_traversal.h +++ b/intern/cycles/kernel/bvh/bvh_traversal.h @@ -172,7 +172,9 @@ ccl_device_noinline bool BVH_FUNCTION_FULL_NAME(BVH)(ccl_global const KernelGlob } } - const int curve_object = kernel_tex_fetch(__prim_object, prim_addr); + const int curve_object = (object == OBJECT_NONE) ? + kernel_tex_fetch(__prim_object, prim_addr) : + object; const int curve_prim = kernel_tex_fetch(__prim_index, prim_addr); const int curve_type = kernel_tex_fetch(__prim_type, prim_addr); const bool hit = curve_intersect( |