diff options
author | Oz Linden <oz@lindenlab.com> | 2013-09-18 14:37:10 -0700 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-09-18 14:37:10 -0700 |
commit | 25e7f5ded1d6cd5f7e136c6023136dfc35b0e118 (patch) | |
tree | 882948c18019e6c94ae2983fdf86d4a5d8303f98 /indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl | |
parent | be84aefc40719dacb9ab2c0ace9a2a706d768ffc (diff) | |
parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) |
merge changes for 3.6.6-release
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl')
-rwxr-xr-x | 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 59d109b886..8525e13333 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl @@ -50,7 +50,7 @@ void main() { discard; } - + frag_data[0] = vec4(col.rgb, 0.0); frag_data[1] = vec4(0,0,0,0); vec3 nvn = normalize(vary_normal); |