diff options
author | simon <none@none> | 2013-11-22 10:39:03 -0800 |
---|---|---|
committer | simon <none@none> | 2013-11-22 10:39:03 -0800 |
commit | f1be57cd30489902e44d7843703a39987f379c69 (patch) | |
tree | 0a4fa748cac9d415fab6095194b6031383d38a85 /indra/newview/app_settings/shaders | |
parent | a7381f6e40388900dd956a54167a33266e82238c (diff) | |
parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) |
Merge server-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; } |