diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-06-07 19:32:34 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-06-07 19:32:34 +0300 |
| commit | 627d42cd566d0800e1cd00cb8b81aec45667a0d5 (patch) | |
| tree | d6ee1052b1f28ad57994e7ff1532b23c96f17977 /source/blender/draw/engines | |
| parent | ec493d79fa7d8f6885d31cae8f3d0cac47604a3c (diff) | |
| parent | b568f445a52f22dcef57fed8b613d3a2dc2c7c22 (diff) | |
Merge branch 'blender-v3.2-release'
# Conflicts:
# source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl
Diffstat (limited to 'source/blender/draw/engines')
| -rw-r--r-- | source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl b/source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl index 186f438b03b..b3b9c7af19c 100644 --- a/source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl @@ -77,3 +77,13 @@ vec3 coordinate_incoming(vec3 P) { return vec3(0.0); } + +float attr_load_temperature_post(float attr) +{ + return attr; +} + +vec4 attr_load_color_post(vec4 attr) +{ + return attr; +} |