diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-12-20 04:52:56 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-12-20 16:14:43 +0300 |
| commit | e2e7f7ea529e352e34c6bed8e9cbf1fa0975f3e8 (patch) | |
| tree | a1345c27bf0d4300020f2278487d7bb98208298a /intern/cycles/kernel/closure/bsdf_hair_principled.h | |
| parent | 5adc06d2d89819522a355cec6bd3022e1b2f41d3 (diff) | |
Fix Cycles OptiX crash with 3D curves after point cloud changes
Includes refactoring to reduce the number of bits taken by primitive types,
so they more easily fit in the OptiX limit.
Diffstat (limited to 'intern/cycles/kernel/closure/bsdf_hair_principled.h')
| -rw-r--r-- | intern/cycles/kernel/closure/bsdf_hair_principled.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/kernel/closure/bsdf_hair_principled.h b/intern/cycles/kernel/closure/bsdf_hair_principled.h index f55ea0f6a2e..c68314889f1 100644 --- a/intern/cycles/kernel/closure/bsdf_hair_principled.h +++ b/intern/cycles/kernel/closure/bsdf_hair_principled.h @@ -213,9 +213,7 @@ ccl_device int bsdf_principled_hair_setup(ccl_private ShaderData *sd, /* TODO: we convert this value to a cosine later and discard the sign, so * we could probably save some operations. */ - float h = (sd->type & (PRIMITIVE_CURVE_RIBBON | PRIMITIVE_MOTION_CURVE_RIBBON)) ? - -sd->v : - dot(cross(sd->Ng, X), Z); + float h = (sd->type & PRIMITIVE_CURVE_RIBBON) ? -sd->v : dot(cross(sd->Ng, X), Z); kernel_assert(fabsf(h) < 1.0f + 1e-4f); kernel_assert(isfinite3_safe(Y)); |