diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-27 00:38:53 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-27 00:38:53 -0500 |
| commit | 7821ff23baafff4e7712a126c17c3947e7b4989e (patch) | |
| tree | 06702d7c7787c5003c1d50953dd08b07a899210d /indra/newview/app_settings/shaders/class1/interface/highlightF.glsl | |
| parent | bf0d36bf889bb913fbc2a53c5a1b9818acb11ee6 (diff) | |
SH-2242 Physics shape display works again, added asserts to flush out areas where state being consumed by a shader does not match state being provided by vertex buffers.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/highlightF.glsl')
| -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 4c0455502f..3a48205101 100644 --- a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl @@ -24,10 +24,10 @@ */ -uniform vec4 highlight_color; +uniform vec4 color; uniform sampler2D diffuseMap; void main() { - gl_FragColor = highlight_color*texture2D(diffuseMap, gl_TexCoord[0].xy); + gl_FragColor = color*texture2D(diffuseMap, gl_TexCoord[0].xy); } |