diff options
author | Oz Linden <oz@lindenlab.com> | 2014-01-23 11:07:32 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-01-23 11:07:32 -0500 |
commit | 197db4976ad8df958b7b2c59a66498398cfd0665 (patch) | |
tree | 21cdd341fbb8adb1b208142fc4e63362090931da /indra/newview/app_settings | |
parent | a4173dc81a21dfac6a8b57e8e1c354b9a37fe5ba (diff) | |
parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) |
merge changes for 3.6.13-release
Diffstat (limited to 'indra/newview/app_settings')
-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; } |