diff options
author | Aura Linden <aura@lindenlab.com> | 2014-03-27 11:59:35 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-03-27 11:59:35 -0700 |
commit | dfd78e83d91832b486a5bba6b1bb1cce621163ab (patch) | |
tree | 5d27537583ea1f06c0e7b469f83ed65c93f70d15 /indra/newview/app_settings/shaders/class1/interface/solidcolorV.glsl | |
parent | 22ea5ac41ca3a1f7a884b56526791f611834f76b (diff) | |
parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) |
Pulled merge from release
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/solidcolorV.glsl')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/interface/solidcolorV.glsl | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/solidcolorV.glsl b/indra/newview/app_settings/shaders/class1/interface/solidcolorV.glsl index c58f9dfdaf..f33115d78d 100755 --- a/indra/newview/app_settings/shaders/class1/interface/solidcolorV.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/solidcolorV.glsl @@ -26,16 +26,13 @@ uniform mat4 modelview_projection_matrix; ATTRIBUTE vec3 position; -ATTRIBUTE vec4 diffuse_color; ATTRIBUTE vec2 texcoord0; -VARYING vec4 vertex_color; VARYING vec2 vary_texcoord0; void main() { gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); - vertex_color = diffuse_color; vary_texcoord0 = texcoord0; } |