diff options
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/avatar')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl | 6 | ||||
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl | 3 | 
2 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl index 3df4d333ce..c98e7d1cd3 100755 --- a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl @@ -31,11 +31,9 @@ uniform vec4 matrixPalette[45];  mat4 getSkinnedTransform()  {  	mat4 ret; -	 -	float x = fract(weight.x);  	int i = int(floor(weight.x)); -		i = min(i, 15); -		i = max(i, 0); +	float x = fract(weight.x); +	  	ret[0] = mix(matrixPalette[i+0], matrixPalette[i+1],  x);  	ret[1] = mix(matrixPalette[i+15],matrixPalette[i+16], x);  	ret[2] = mix(matrixPalette[i+30],matrixPalette[i+31], x); diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl index 12996cf0d6..271947b2dd 100755 --- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl @@ -35,9 +35,6 @@ 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;  | 
