diff options
author | Dave Parks <davep@lindenlab.com> | 2013-04-16 03:02:00 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-04-16 03:02:00 -0500 |
commit | d1f713f30bd4d42fe4696e25c01ab4532ef3b69b (patch) | |
tree | ea36b2c6565afd1bf4c00f36bea44a31cf0fce37 /indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl | |
parent | fafa21315f043ab51e3373e825c85646685778a6 (diff) | |
parent | f964e51fc98ed9b31cb9b3e4dad2ccde14de777b (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl index 40b980bf51..a2c3ec3355 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl @@ -46,7 +46,7 @@ void main() frag_data[0] = vec4(col, 0.0); frag_data[1] = vertex_color.aaaa; // spec - //frag_data[1] = vec4(vec3(vertex_color.a), vertex_color.a+(1.0-vertex_color.a)*vertex_color.a); // spec - from former class3 - maybe better, but not so well tested + frag_data[1] = vec4(vec3(vertex_color.a), vertex_color.a+(1.0-vertex_color.a)*vertex_color.a); // spec - from former class3 - maybe better, but not so well tested vec3 nvn = normalize(vary_normal); frag_data[2] = vec4(encode_normal(nvn.xyz), vertex_color.a, 0.0); } |