summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/avatar
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-10-28 16:26:20 -0500
committerDave Parks <davep@lindenlab.com>2011-10-28 16:26:20 -0500
commit969aa248a4c398dd0608a447f99cf74683d09f65 (patch)
tree2324ed739146db02597a27e186b7d3841c2d45fd /indra/newview/app_settings/shaders/class1/avatar
parent735708583fc6e236df3ad6d4c9a5f02b6ec7605a (diff)
SH-2633 Fix for avatar hair turning white when editing appearance
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/avatar')
-rw-r--r--indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl
index 2901e18db8..19203ab670 100644
--- a/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl
@@ -32,6 +32,7 @@ ATTRIBUTE vec2 texcoord0;
VARYING vec4 vertex_color;
VARYING vec2 vary_texcoord0;
+uniform vec4 color;
vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
mat4 getSkinnedTransform();
@@ -61,8 +62,8 @@ void main()
calcAtmospherics(pos.xyz);
- vec4 color = calcLighting(pos.xyz, norm, vec4(1,1,1,1), vec4(0,0,0,0));
- vertex_color = color;
+ vec4 col = calcLighting(pos.xyz, norm, color, vec4(0,0,0,0));
+ vertex_color = col;
}