diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-06-30 15:07:49 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-06-30 15:36:52 +0300 |
| commit | 4e9ed1dae9647bf45a30d3af546f5a08e7a9b3e3 (patch) | |
| tree | c5bda4e60fd156d953bab2454f87cb7a3e04cf4e /intern/cycles/kernel/geom/geom_primitive.h | |
| parent | 8aaca8840295582387b480794ab94b2bdf28174e (diff) | |
Fix T78447: Cycles vertex color node not working with hair
Diffstat (limited to 'intern/cycles/kernel/geom/geom_primitive.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_primitive.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/kernel/geom/geom_primitive.h b/intern/cycles/kernel/geom/geom_primitive.h index 9a91da79f58..997abf438d0 100644 --- a/intern/cycles/kernel/geom/geom_primitive.h +++ b/intern/cycles/kernel/geom/geom_primitive.h @@ -174,6 +174,11 @@ ccl_device_inline float4 primitive_attribute_float4(KernelGlobals *kg, else return subd_triangle_attribute_float4(kg, sd, desc, dx, dy); } +#ifdef __HAIR__ + else if (sd->type & PRIMITIVE_ALL_CURVE) { + return curve_attribute_float4(kg, sd, desc, dx, dy); + } +#endif else { if (dx) *dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f); |