diff options
author | simon <none@none> | 2013-10-17 14:59:47 -0700 |
---|---|---|
committer | simon <none@none> | 2013-10-17 14:59:47 -0700 |
commit | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (patch) | |
tree | b0fb75fa893f2776baa2f6b92624e7a298401d73 /indra | |
parent | 8eb56668feb91032136ccfabee44c3ceb1d586b3 (diff) | |
parent | 437efd9b866074d2385a70183af34ec1414ad59a (diff) |
Merge
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl index 3df4d333ce..c98e7d1cd3 100755 --- a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl @@ -31,11 +31,9 @@ uniform vec4 matrixPalette[45]; mat4 getSkinnedTransform() { mat4 ret; - - float x = fract(weight.x); int i = int(floor(weight.x)); - i = min(i, 15); - i = max(i, 0); + float x = fract(weight.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); |