summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-02-10 15:58:08 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-02-10 15:58:08 -0500
commit711d70bd4c2a69c5176759f8bcd2ab0b3e1d1715 (patch)
tree488e783c98321b8d3eb7e4c5ec7ca28f0cd5ea02 /indra/newview/app_settings
parent49b8f8af026a627db47c9592fc92eccda790401e (diff)
parente3ed1565f8c6eeff5d87f862465038aa98576fa9 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings')
-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 eef6556fba..ef823c28b1 100644
--- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
@@ -9,7 +9,7 @@
attribute vec4 object_weight;
-uniform mat4 matrixPalette[64];
+uniform mat4 matrixPalette[32];
mat4 getObjectSkinnedTransform()
{