Commit: fe719af5e79b0628d75cbc94d9b88c03b682725a Author: Brecht Van Lommel Date: Thu Aug 19 17:53:01 2021 +0200 Branches: cycles-x https://developer.blender.org/rBfe719af5e79b0628d75cbc94d9b88c03b682725a
Merge branch 'master' into cycles-x =================================================================== =================================================================== diff --cc intern/cycles/kernel/geom/geom_triangle.h index b534bfd3798,1e7fbd9c7fb..a0b3f7ca6c4 --- a/intern/cycles/kernel/geom/geom_triangle.h +++ b/intern/cycles/kernel/geom/geom_triangle.h @@@ -115,9 -107,23 +115,23 @@@ triangle_smooth_normal(const KernelGlob return is_zero(N) ? Ng : N; } + ccl_device_inline float3 -triangle_smooth_normal_unnormalized(KernelGlobals *kg, float3 Ng, int prim, float u, float v) ++triangle_smooth_normal_unnormalized(const KernelGlobals *kg, float3 Ng, int prim, float u, float v) + { + /* load triangle vertices */ + const uint4 tri_vindex = kernel_tex_fetch(__tri_vindex, prim); + float3 n0 = float4_to_float3(kernel_tex_fetch(__tri_vnormal, tri_vindex.x)); + float3 n1 = float4_to_float3(kernel_tex_fetch(__tri_vnormal, tri_vindex.y)); + float3 n2 = float4_to_float3(kernel_tex_fetch(__tri_vnormal, tri_vindex.z)); + + float3 N = (1.0f - u - v) * n2 + u * n0 + v * n1; + + return is_zero(N) ? Ng : N; + } + /* Ray differentials on triangle */ -ccl_device_inline void triangle_dPdudv(KernelGlobals *kg, +ccl_device_inline void triangle_dPdudv(const KernelGlobals *kg, int prim, ccl_addr_space float3 *dPdu, ccl_addr_space float3 *dPdv) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs