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.

1 files changed, 3 insertions, 3 deletions

diff --git a/intern/cycles/kernel/svm/closure.h b/intern/cycles/kernel/svm/closure.h
index 71952e9e0f8..2ca22d58191 100644
--- a/intern/cycles/kernel/svm/closure.h
+++ b/intern/cycles/kernel/svm/closure.h
@@ -107,7 +107,7 @@ ccl_device_noinline int svm_node_closure_bsdf(KernelGlobals kg,
   }
 
   float3 N = stack_valid(data_node.x) ? stack_load_float3(stack, data_node.x) : sd->N;
-  if (!(sd->type & PRIMITIVE_ALL_CURVE)) {
+  if (!(sd->type & PRIMITIVE_CURVE)) {
     N = ensure_valid_reflection(sd->Ng, sd->I, N);
   }
 
@@ -191,7 +191,7 @@ ccl_device_noinline int svm_node_closure_bsdf(KernelGlobals kg,
       float3 clearcoat_normal = stack_valid(data_cn_ssr.x) ?
                                     stack_load_float3(stack, data_cn_ssr.x) :
                                     sd->N;
-      if (!(sd->type & PRIMITIVE_ALL_CURVE)) {
+      if (!(sd->type & PRIMITIVE_CURVE)) {
         clearcoat_normal = ensure_valid_reflection(sd->Ng, sd->I, clearcoat_normal);
       }
       float3 subsurface_radius = stack_valid(data_cn_ssr.y) ?
@@ -902,7 +902,7 @@ ccl_device_noinline int svm_node_closure_bsdf(KernelGlobals kg,
         if (stack_valid(data_node.y)) {
           bsdf->T = normalize(stack_load_float3(stack, data_node.y));
         }
-        else if (!(sd->type & PRIMITIVE_ALL_CURVE)) {
+        else if (!(sd->type & PRIMITIVE_CURVE)) {
           bsdf->T = normalize(sd->dPdv);
           bsdf->offset = 0.0f;
         }