diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-05-04 12:15:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-05-04 12:15:27 -0500 |
| commit | 7bb6532e93b7536a9a11cf19db10ba0cda1d99c3 (patch) | |
| tree | 1b01007746da568e73baef6cb7ac888815f1757e /indra/newview/app_settings | |
| parent | ddad6dd5ea88705a0b7db603e1785715593624de (diff) | |
| parent | 744f2e4951fc6fc1a1f08e97fc446e909c1fe39e (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl index 6f027de6a2..7d18ae5036 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl @@ -54,8 +54,7 @@ void main() color.rgb = scaleSoftClip(color.rgb); - gl_FragColor = gl_Color; - //gl_FragColor = color; + gl_FragColor = color; //gl_FragColor = vec4(1,0,1,1); //gl_FragColor = vec4(1,0,1,1)*shadow; |