diff options
| author | simon <none@none> | 2014-04-21 12:36:35 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-21 12:36:35 -0700 |
| commit | 0b9a777bfd3c85390c55d91fc3dc5c4bee9bf71b (patch) | |
| tree | dd3f484813df4f1a74a525f3f6dddcbc91beac7c /indra/newview/app_settings/shaders/class1 | |
| parent | e606b7918dc6dbe2a4048f4bbd8590bfc3eca90e (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Merge downstream code updating version to 3.7.7
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); |