diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-01 16:16:11 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-01 16:16:11 -0500 |
commit | 38a258d04a98939e12bb2cfce6caea288a7fc3a5 (patch) | |
tree | f221aca4c34189bb1cced52a2edb86cc67314138 /indra/newview/app_settings/shaders/class1 | |
parent | 1135ba80ec569e20187c36a5364debf9eae8aab7 (diff) | |
parent | fa9097b65f9d89fd0c8bf7b32924f0327a617cdc (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index b40785bbd7..506118d381 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -111,10 +111,9 @@ void main() #ifdef USE_INDEXED_TEX passTextureIndex(); - vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy; -#else - vary_texcoord0 = texcoord0; #endif + + vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy; vary_norm = norm; vary_position = pos.xyz; |