diff options
author | Merov Linden <merov@lindenlab.com> | 2013-11-21 15:26:51 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-11-21 15:26:51 -0800 |
commit | 6d24bb6eab5e62af8909ea9659517a82ca21513b (patch) | |
tree | 7630f299e9a707df4bad803c0e3e37d00c4658bc /indra/newview/app_settings/shaders | |
parent | 22a3b0bd7baf132a90ddf02d5eb965b71451b757 (diff) | |
parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings/shaders')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl index 12996cf0d6..39632d0cef 100755 --- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl @@ -34,17 +34,17 @@ mat4 getObjectSkinnedTransform() vec4 w = fract(weight4); vec4 index = floor(weight4); - + index = min(index, vec4(31.0)); index = max(index, vec4( 0.0)); float scale = 1.0/(w.x+w.y+w.z+w.w); w *= scale; - - mat4 mat = matrixPalette[int(index.x)]*w.x; - mat += matrixPalette[int(index.y)]*w.y; - mat += matrixPalette[int(index.z)]*w.z; - mat += matrixPalette[int(index.w)]*w.w; + + mat4 mat = matrixPalette[int(index.x)]*w.x; + mat += matrixPalette[int(index.y)]*w.y; + mat += matrixPalette[int(index.z)]*w.z; + mat += matrixPalette[int(index.w)]*w.w; return mat; } |