diff options
author | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
commit | 27cf0ec7f34887ada651307fe438ef0d627bf67f (patch) | |
tree | 90611a41d9ad25b98db6899745208c8aab51c150 /indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl | |
parent | c6aa86750c22c20dca6895695386e2357b953bbd (diff) | |
parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) |
Merge with 3.6.11
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl')
-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; } |