diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-21 16:21:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-21 16:21:31 -0400 |
| commit | b1a7137ba6e56e1b692205f129d86acc942209e9 (patch) | |
| tree | 595b9e3a2b9e4be799459e06c9b33793013d0ae0 /indra/newview/app_settings/shaders/class1 | |
| parent | 32bbb07f0a727b5aa318ba3c32764ec29cc96956 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
merge changes for 3.7.6-release
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
| -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 c98e7d1cd3..bc63d07d72 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); |