diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-22 13:05:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-22 13:05:26 -0400 |
| commit | b4ca93cadce90466d41704b68933c21fe909bcb8 (patch) | |
| tree | 34b19278571d885a42c5ae31baeb5af532e7ea39 /indra/newview/app_settings/shaders | |
| parent | cd382d08c84e2d984a4a20888280084daa290c3f (diff) | |
| parent | b1a7137ba6e56e1b692205f129d86acc942209e9 (diff) | |
merge up to 3.7.6-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 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); |