1 files changed, 25 insertions, 6 deletions

diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_lib.glsl
index abecb373995..a65bb7decb6 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_lib.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_lib.glsl
@@ -112,6 +112,7 @@ float attr_load_float(float attr)
 /** \name Curve
  *
  * Curve objects loads attributes from buffers through sampler buffers.
+ * Per attribute scope follows loading order.
  * \{ */
 
 #  ifdef OBINFO_LIB
@@ -122,6 +123,24 @@ vec3 attr_load_orco(vec4 orco)
   return OrcoTexCoFactors[0].xyz + lP * OrcoTexCoFactors[1].xyz;
 }
 #  endif
+
+int g_curves_attr_id = 0;
+
+/* Return the index to use for looking up the attribute value in the sampler
+ * based on the attribute scope (point or spline). */
+int curves_attribute_element_id()
+{
+  int id = interp.curves_strand_id;
+  if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
+#  ifdef COMMON_HAIR_LIB
+    id = hair_get_base_id();
+#  endif
+  }
+
+  g_curves_attr_id += 1;
+  return id;
+}
+
 vec4 attr_load_tangent(samplerBuffer cd_buf)
 {
   /* Not supported for the moment. */
@@ -137,19 +156,19 @@ vec4 attr_load_color(samplerBuffer cd_buf)
 }
 vec4 attr_load_vec4(samplerBuffer cd_buf)
 {
-  return texelFetch(cd_buf, interp.curves_strand_id).rgba;
+  return texelFetch(cd_buf, curves_attribute_element_id()).rgba;
 }
 vec3 attr_load_vec3(samplerBuffer cd_buf)
 {
-  return texelFetch(cd_buf, interp.curves_strand_id).rgb;
+  return texelFetch(cd_buf, curves_attribute_element_id()).rgb;
 }
 vec2 attr_load_vec2(samplerBuffer cd_buf)
 {
-  return texelFetch(cd_buf, interp.curves_strand_id).rg;
+  return texelFetch(cd_buf, curves_attribute_element_id()).rg;
 }
 float attr_load_float(samplerBuffer cd_buf)
 {
-  return texelFetch(cd_buf, interp.curves_strand_id).r;
+  return texelFetch(cd_buf, curves_attribute_element_id()).r;
 }
 
 /** \} */
@@ -164,7 +183,7 @@ float attr_load_float(samplerBuffer cd_buf)
  * \{ */
 
 #  ifndef OBINFO_LIB
-#    error "draw_object_infos is mandatory for volume objects"
+#    error draw_object_infos is mandatory for volume objects
 #  endif
 
 vec3 g_orco;
@@ -268,7 +287,7 @@ vec3 attr_load_uv(vec3 attr)
 /** \name Volume Attribute post
  *
  * TODO(@fclem): These implementation details should concern the DRWManager and not be a fix on
- * the engine side. But as of now, the engines are reponsible for loading the attributes.
+ * the engine side. But as of now, the engines are responsible for loading the attributes.
  *
  * \{ */