Merge branch 'master' into feature-imformatfeature-imformat

1 files changed, 3 insertions, 41 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 a65bb7decb6..6fe5fa01fa3 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
@@ -3,6 +3,8 @@
 #pragma BLENDER_REQUIRE(common_math_lib.glsl)
 #pragma BLENDER_REQUIRE(gpu_shader_codegen_lib.glsl)
 
+#define EEVEE_ATTRIBUTE_LIB
+
 #if defined(MAT_GEOM_MESH)
 
 /* -------------------------------------------------------------------- */
@@ -131,7 +133,7 @@ int g_curves_attr_id = 0;
 int curves_attribute_element_id()
 {
   int id = interp.curves_strand_id;
-  if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
+  if (drw_curves.is_point_attribute[g_curves_attr_id][0] != 0) {
 #  ifdef COMMON_HAIR_LIB
     id = hair_get_base_id();
 #  endif
@@ -282,43 +284,3 @@ vec3 attr_load_uv(vec3 attr)
 /** \} */
 
 #endif
-
-/* -------------------------------------------------------------------- */
-/** \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 responsible for loading the attributes.
- *
- * \{ */
-
-#if defined(MAT_GEOM_VOLUME)
-
-float attr_load_temperature_post(float attr)
-{
-  /* Bring the into standard range without having to modify the grid values */
-  attr = (attr > 0.01) ? (attr * drw_volume.temperature_mul + drw_volume.temperature_bias) : 0.0;
-  return attr;
-}
-vec4 attr_load_color_post(vec4 attr)
-{
-  /* Density is premultiplied for interpolation, divide it out here. */
-  attr.rgb *= safe_rcp(attr.a);
-  attr.rgb *= drw_volume.color_mul.rgb;
-  attr.a = 1.0;
-  return attr;
-}
-
-#else /* Noop for any other surface. */
-
-float attr_load_temperature_post(float attr)
-{
-  return attr;
-}
-vec4 attr_load_color_post(vec4 attr)
-{
-  return attr;
-}
-
-#endif
-
-/** \} */