summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class3/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/class3/avatar
parent735708583fc6e236df3ad6d4c9a5f02b6ec7605a (diff)
SH-2633 Fix for avatar hair turning white when editing appearance
Diffstat (limited to 'indra/newview/app_settings/shaders/class3/avatar')
-rw-r--r--indra/newview/app_settings/shaders/class3/avatar/avatarV.glsl6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class3/avatar/avatarV.glsl b/indra/newview/app_settings/shaders/class3/avatar/avatarV.glsl
index 7fb3cb6552..721054b5ad 100644
--- a/indra/newview/app_settings/shaders/class3/avatar/avatarV.glsl
+++ b/indra/newview/app_settings/shaders/class3/avatar/avatarV.glsl
@@ -37,6 +37,8 @@ vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
mat4 getSkinnedTransform();
void calcAtmospherics(vec3 inPositionEye);
+uniform vec4 color;
+
uniform vec4 gWindDir;
uniform vec4 gSinWaveParams;
uniform vec4 gGravity;
@@ -125,8 +127,8 @@ void main()
calcAtmospherics(pos.xyz);
- vec4 color = calcLighting(pos.xyz, norm, vec4(1,1,1,1), vec4(0.0));
- vertex_color = color;
+ vec4 col = calcLighting(pos.xyz, norm, color, vec4(0.0));
+ vertex_color = col;
gl_Position = projection_matrix * pos;
}