summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-02-13 11:26:28 -0600
committerDave Parks <davep@lindenlab.com>2013-02-13 11:26:28 -0600
commit3fa68c78f8f3a190fffeadd7a181cff16fbc96b0 (patch)
tree3362c3812ade174a372b1c51f1870fc7bcc618a5 /indra
parentd706766baeb0f88ce359713a16fc685efc5c86b6 (diff)
parent33016d36e8033aba17abef5202b6da162771f979 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
index 43ed41a205..2745d5fd95 100644
--- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
@@ -26,7 +26,7 @@
ATTRIBUTE vec4 weight4;
-uniform mat4 matrixPalette[32];
+uniform mat4 matrixPalette[64];
mat4 getObjectSkinnedTransform()
{