diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-07-08 14:35:55 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-07-08 19:09:52 +0300 |
| commit | 1715c396e450d41550e70c665211354c303a7275 (patch) | |
| tree | 1b70c44f77328919f7741988bdc132a5e8f3b468 /source/blender/draw/engines | |
| parent | 8a7c2c4192aff7f34e50dac83bd793e0247fc604 (diff) | |
Fix T65534 Eevee don't respect active UVmap
Diffstat (limited to 'source/blender/draw/engines')
| -rw-r--r-- | source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl index 7872c1380ed..7eb12dbdeb9 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl @@ -2,14 +2,14 @@ #ifndef HAIR_SHADER in vec3 pos; in vec3 nor; -in vec2 u; /* active texture layer */ +in vec2 au; /* active texture layer */ # ifdef V3D_SHADING_VERTEX_COLOR -in vec3 c; /* active color */ +in vec3 ac; /* active color */ # endif -# define uv u +# define uv au #else /* HAIR_SHADER */ # ifdef V3D_SHADING_TEXTURE_COLOR -uniform samplerBuffer u; /* active texture layer */ +uniform samplerBuffer au; /* active texture layer */ # endif flat out float hair_rand; #endif /* HAIR_SHADER */ @@ -58,7 +58,7 @@ void main() { #ifdef HAIR_SHADER # ifdef V3D_SHADING_TEXTURE_COLOR - vec2 uv = hair_get_customdata_vec2(u); + vec2 uv = hair_get_customdata_vec2(au); # endif float time, thick_time, thickness; vec3 world_pos, tan, binor; @@ -86,7 +86,7 @@ void main() #ifdef V3D_SHADING_VERTEX_COLOR # ifndef HAIR_SHADER - vertexColor = srgb_to_linear_attr(c); + vertexColor = srgb_to_linear_attr(ac); # endif #endif |