diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-26 15:43:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-26 15:43:42 -0500 |
| commit | 224217dae82ad5f5127c511de6c7237fa81f36bb (patch) | |
| tree | dcac313b4655fceac4f710e764fa6cf437475040 /indra/newview/app_settings/shaders/class1/avatar | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
| parent | 302f4085a5f9fd7b5267fd573a8e15f890cfe573 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/avatar')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl b/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl index 3e4d438ed3..7a35905280 100644 --- a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl @@ -24,7 +24,9 @@ */ #ifdef DEFINE_GL_FRAGCOLOR -out vec4 gl_FragColor; +out vec4 frag_color; +#else +#define frag_color gl_FragColor #endif VARYING vec4 vertex_color; @@ -34,5 +36,5 @@ uniform sampler2D diffuseMap; void main() { - gl_FragColor = vec4(vertex_color.rgb, texture2D(diffuseMap, vary_texcoord0.xy).a); + frag_color = vec4(vertex_color.rgb, texture2D(diffuseMap, vary_texcoord0.xy).a); } |