From ae636994cdf2241d8de3eaf7f2405fa1976c0a5e Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 29 Jun 2021 16:34:32 +0200 Subject: Fix Cycles hair render error on GPU after recent changes Volumes primitive needs to be part of traceable primitives. --- intern/cycles/kernel/kernel_types.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 48aa2ca76e6..d224db91edc 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -689,12 +689,11 @@ typedef enum PrimitiveType { PRIMITIVE_MOTION_CURVE_THICK = (1 << 3), PRIMITIVE_CURVE_RIBBON = (1 << 4), PRIMITIVE_MOTION_CURVE_RIBBON = (1 << 5), + PRIMITIVE_VOLUME = (1 << 6), /* Lamp primitive is not included below on purpose, * since it is no real traceable primitive. */ - PRIMITIVE_LAMP = (1 << 6), - - PRIMITIVE_VOLUME = (1 << 7), + PRIMITIVE_LAMP = (1 << 7), PRIMITIVE_ALL_TRIANGLE = (PRIMITIVE_TRIANGLE | PRIMITIVE_MOTION_TRIANGLE), PRIMITIVE_ALL_CURVE = (PRIMITIVE_CURVE_THICK | PRIMITIVE_MOTION_CURVE_THICK | -- cgit v1.2.3