diff options
author | Oz Linden <oz@lindenlab.com> | 2013-11-21 15:35:25 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-11-21 15:35:25 -0500 |
commit | 915ade1029eb39fcd8f3b997b4b8cf2b394c1eb9 (patch) | |
tree | 577c0d98b21d05f0b6f28241f2ab2b7ee31f8618 /indra/newview/app_settings/shaders | |
parent | dd7b0f96157bdfbdd8892cc8aa209182ae777380 (diff) | |
parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) |
merge changes for 3.6.11-release
Diffstat (limited to 'indra/newview/app_settings/shaders')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl index 3bbcf32482..972d10b325 100755 --- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl @@ -36,13 +36,13 @@ mat4 getObjectSkinnedTransform() vec4 w = fract(weight4); vec4 index = floor(weight4); - + index = min(index, vec4(63.0)); index = max(index, vec4( 0.0)); float scale = 1.0/(w.x+w.y+w.z+w.w); w *= scale; - + int i1 = int(index.x); int i2 = int(index.y); int i3 = int(index.z); |