diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-11-19 20:27:25 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-11-19 20:27:25 -0800 |
| commit | 22a3b0bd7baf132a90ddf02d5eb965b71451b757 (patch) | |
| tree | 02d02041f724a1c2efd97f9580685ebefa747eb8 /indra/newview | |
| parent | 8af432481db885afe215ef51da749543a59f3c6a (diff) | |
MAINT-2287 : Fix merge errors when merging viewer-release
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index cff2619cfb..c47e8b5872 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.6.9 +3.6.10 diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl index 9a8dbeab58..bc63d07d72 100755 --- a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl @@ -31,12 +31,10 @@ uniform vec4 matrixPalette[45]; mat4 getSkinnedTransform() { mat4 ret; - - float x = fract(weight.x); int i = int(floor(weight.x)); - i = int(min(i, 15)); - i = int(max(i, 0)); - ret[0] = mix(matrixPalette[i+0], matrixPalette[i+1], x); + 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); ret[3] = vec4(0,0,0,1); |