blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix T92128: Cycles CUDA wrong hair attributes, after recent changes

This commit is contained in:
Brecht Van Lommel 2021-10-15 15:31:31 +02:00
parent f834939ceb
commit 53f25df5bc
Notes: blender-bot 2023-02-14 01:57:12 +01:00 
Referenced by issue #92128, Cuda failing to respect texture coordinate for image vector in principle Hair BSDF
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/bvh/bvh_shadow_all.h
View File

@ -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(

4
intern/cycles/kernel/bvh/bvh_traversal.h
View File

@ -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(