diff options
author | Cho <cho@lindenlab.com> | 2014-04-24 23:44:47 +0100 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2014-04-24 23:44:47 +0100 |
commit | 6cc318fda28a878186d35c79bf5474d4d1ac66d3 (patch) | |
tree | 2cc623f32ec473931403613ca17ea9873938ed9b /indra/newview/app_settings/shaders/class1 | |
parent | 446a3193b1f2932ed14a16216bcf65dc30889612 (diff) | |
parent | 80fcd6d9d42377fc09928eb99f26e6287c4b544d (diff) |
merge
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); |