diff options
author | simon <none@none> | 2013-12-09 16:11:09 -0800 |
---|---|---|
committer | simon <none@none> | 2013-12-09 16:11:09 -0800 |
commit | 50cba7940fbea7602f6b55df85fb9a2d2b47279b (patch) | |
tree | 269464d15a8d4a8803535b843e8ce7dcac7414cb /indra/newview/app_settings | |
parent | 1a456c2e41905e93e393dc2dda0d143ee7611275 (diff) | |
parent | 4a09065691b6a3461ff2f4541abb3accade207fe (diff) |
Merge in downstream code for 3.6.13
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; } |