summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-10-17 14:44:15 -0700
committerGraham Linden <graham@lindenlab.com>2013-10-17 14:44:15 -0700
commit437efd9b866074d2385a70183af34ec1414ad59a (patch)
tree49df99509ef59a9c179e3342f5e65c57657e1942 /indra/newview/app_settings
parent4621aedc37bd8ad4042fe29283a2309d94264938 (diff)
MAINT-3330 fix regression on mac caused by shader change for 3107 by rolling back to prev version of shader
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
index 3df4d333ce..c98e7d1cd3 100755
--- a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
@@ -31,11 +31,9 @@ uniform vec4 matrixPalette[45];
mat4 getSkinnedTransform()
{
mat4 ret;
-
- float x = fract(weight.x);
int i = int(floor(weight.x));
- i = min(i, 15);
- i = max(i, 0);
+ float x = fract(weight.x);
+
ret[0] = mix(matrixPalette[i+0], matrixPalette[i+1], x);
ret[1] = mix(matrixPalette[i+15],matrixPalette[i+16], x);
ret[2] = mix(matrixPalette[i+30],matrixPalette[i+31], x);