diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-04-23 12:47:23 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-04-23 12:47:23 -0700 |
| commit | 1953c569a6acfd731af2c459da7a6928be4aaf5b (patch) | |
| tree | f5e66a37eed56d418ad3fab290645a8ce4da943f /indra/newview/app_settings/shaders/class1 | |
| parent | 8fd239233dca9639c6d0139e8f697da97bfe036e (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Merge with viewer-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); |