diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2012-09-08 18:56:43 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2012-09-08 18:56:43 -0400 |
commit | 4091e47cf206a41cac7ee440b8fd2e2898006685 (patch) | |
tree | 61de24d7aa90171a5fb6481189567fe408d03786 /indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl | |
parent | 81b9e29a1fe227c8f51c6a644b4e2e1afa6bcfb2 (diff) | |
parent | 09cd2a4b1a9f1ddf046fb0ce5d12988b968269a3 (diff) |
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
cmake and other files didn't get moved over, do it by hand.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl index ead384b07c..4c68123fac 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl @@ -48,5 +48,5 @@ void main() frag_data[0] = vec4(col.rgb, 0.0); frag_data[1] = vec4(0,0,0,0); vec3 nvn = normalize(vary_normal); - frag_data[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0); + frag_data[2] = vec4(nvn.xyz * 0.5 + 0.5, 0.0); } |