diff options
author | Graham Linden <graham@lindenlab.com> | 2013-09-19 17:39:56 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2013-09-19 17:39:56 -0700 |
commit | d3e954cfaca067adf60f2e3c161028c6549263e4 (patch) | |
tree | 54826d4b8ff8fa7683770876bb654c3afdaaf076 /indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl | |
parent | 79836e32d575248642cfd6af837548aac054988f (diff) | |
parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) |
Merge 3.6.6 Materials RC and update Intel HD gpu_table entries to expect GL 4.2 to nag resis to get the fixed Intel driver
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); |