Automated merge with https://bitbucket.org/lindenlab/viewer-cat

1 files changed, 16 insertions, 10 deletions

diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
index 2745d5fd95..ff30560adc 100644
--- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
@@ -30,18 +30,24 @@ uniform mat4 matrixPalette[64];
 
 mat4 getObjectSkinnedTransform()
 {
-	int i; 
 	
-	vec4 w = fract(weight4);
-	vec4 index = floor(weight4);
-	
-	float scale = 1.0/(w.x+w.y+w.z+w.w);
-	w *= scale;
+	float w0 = fract(weight4.x);
+	float w1 = fract(weight4.y);
+	float w2 = fract(weight4.z);
+	float w3 = fract(weight4.w);
+			
+	int i0 = int(floor(weight4.x));
+	int i1 = int(floor(weight4.y));
+	int i2 = int(floor(weight4.z));
+	int i3 = int(floor(weight4.w));
+
+	//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[i0]*w0;
+	mat += matrixPalette[i1]*w1;
+	mat += matrixPalette[i2]*w2;
+	mat += matrixPalette[i3]*w3;
 		
 	return mat;
 }