diff options
author | Aura Linden <aura@lindenlab.com> | 2014-09-19 10:54:55 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-09-19 10:54:55 -0700 |
commit | c25a7866408d8590b7e9672d019089cb1358dbce (patch) | |
tree | 22c361d0b9647c74813fda9cffd75617036cef17 /indra/newview/app_settings/shaders/class1 | |
parent | 9ae872da5996d6c7d1f35fbf5f5c6edc75fae3c5 (diff) | |
parent | 951c83724d7e364ac52cbee2d657711fda7d2c26 (diff) |
Pulled merge from viewer-tiger
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; |