diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-11-25 12:32:21 -0500 | 
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-11-25 12:32:21 -0500 | 
| commit | fc4f6e2dacfc8944b1536004fed80c4ca3a24544 (patch) | |
| tree | 3eb7254290b834ae5f2529861a76c41d8decad1e /indra/newview/app_settings | |
| parent | d191585a3eec778e36e5f0c4b620c3d525c86c42 (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
Merge.  Refresh from viewer-release after 3.6.11 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;  } | 
