[Bf-blender-cvs] [ae636994cdf] master: Fix Cycles hair render error on GPU after recent changes

[Brecht Van Lommel]

Commit: ae636994cdf2241d8de3eaf7f2405fa1976c0a5e
Author: Brecht Van Lommel
Date:   Tue Jun 29 16:34:32 2021 +0200
Branches: master
https://developer.blender.org/rBae636994cdf2241d8de3eaf7f2405fa1976c0a5e

Fix Cycles hair render error on GPU after recent changes

Volumes primitive needs to be part of traceable primitives.

===================================================================

M	intern/cycles/kernel/kernel_types.h

===================================================================

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 |