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/geom/motion_triangle_shader.h | |
| parent | b64d551f3b2fa409b4eeefb641fc581eb6cd0bd6 (diff) | |
| parent | fe1816f67fbc6aaf383ec77847d668367335d093 (diff) | |
Merge branch 'master' into KTX_supportKTX_support
Diffstat (limited to 'intern/cycles/kernel/geom/motion_triangle_shader.h')
| -rw-r--r-- | intern/cycles/kernel/geom/motion_triangle_shader.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/intern/cycles/kernel/geom/motion_triangle_shader.h b/intern/cycles/kernel/geom/motion_triangle_shader.h index fc7c181882e..15730c83969 100644 --- a/intern/cycles/kernel/geom/motion_triangle_shader.h +++ b/intern/cycles/kernel/geom/motion_triangle_shader.h @@ -68,15 +68,7 @@ ccl_device_noinline void motion_triangle_shader_setup(KernelGlobals kg, verts[1] = (1.0f - t) * verts[1] + t * next_verts[1]; verts[2] = (1.0f - t) * verts[2] + t * next_verts[2]; /* Compute refined position. */ -#ifdef __BVH_LOCAL__ - if (is_local) { - sd->P = motion_triangle_refine_local(kg, sd, P, D, ray_t, isect_object, isect_prim, verts); - } - else -#endif /* __BVH_LOCAL__*/ - { - sd->P = motion_triangle_refine(kg, sd, P, D, ray_t, isect_object, isect_prim, verts); - } + sd->P = motion_triangle_point_from_uv(kg, sd, isect_object, isect_prim, sd->u, sd->v, verts); /* Compute face normal. */ float3 Ng; if (sd->object_flag & SD_OBJECT_NEGATIVE_SCALE_APPLIED) { |