diff options
author | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
commit | 1333e9332a074e25178cd28b351bb40998617e10 (patch) | |
tree | c229dd9782a27e3c72d7d99c4a6e15367fb8dbd9 /indra/newview/app_settings/shaders | |
parent | 6a3cb427071641585d9beb44c3e46a148f90a791 (diff) | |
parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) |
merge changes for 3.7.23
Diffstat (limited to 'indra/newview/app_settings/shaders')
-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; |