diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-10 11:39:08 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-10 11:39:08 -0600 |
| commit | c8f558f6775d62f03d6caab19668df80e95e8a8b (patch) | |
| tree | b74dd0d7e34bf670ebf59b2f37c6c7509f599d87 /indra/newview/app_settings | |
| parent | aa8f3d30704ea43a8fc2f9262a57968277c4db20 (diff) | |
SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter.
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/highlightF.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl index 574adeb50c..ecbc30f05f 100644 --- a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl @@ -27,12 +27,12 @@ out vec4 gl_FragColor; #endif -uniform vec4 highlight_color; +uniform vec4 color; uniform sampler2D diffuseMap; VARYING vec2 vary_texcoord0; void main() { - gl_FragColor = highlight_color*texture2D(diffuseMap, vary_texcoord0.xy); + gl_FragColor = color*texture2D(diffuseMap, vary_texcoord0.xy); } |