diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:19:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:19:35 -0500 |
| commit | 3c2b90514d1390594149f35a88f2e5d27d173d58 (patch) | |
| tree | 844fbaf5f5c285876601e098c2e109c35d542f07 /indra/newview/app_settings/shaders | |
| parent | b8f1e2a7704bdac5ef270be21918317a17f77b2a (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
merge 3.6.10-release
Diffstat (limited to 'indra/newview/app_settings/shaders')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl index bc63d07d72..c98e7d1cd3 100755 --- a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl @@ -33,8 +33,8 @@ mat4 getSkinnedTransform() mat4 ret; int i = int(floor(weight.x)); float x = fract(weight.x); - - ret[0] = mix(matrixPalette[i+0], matrixPalette[i+1], 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); ret[3] = vec4(0,0,0,1); |