summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-05-13 10:57:05 -0500
committerDave Parks <davep@lindenlab.com>2013-05-13 10:57:05 -0500
commitedd63499527983e2b7afc76a9f01dd1a37c17d3a (patch)
tree0f366ef4e1ed99c959f37a2b4c46cd92b5e9327e /indra/newview/app_settings/shaders
parent5ac9d9cb05f22099bea8c9312f5e0b234430022a (diff)
parentefe8d75fe31ada16d00d0b5545071d2adbab54ad (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/app_settings/shaders')
-rwxr-xr-xindra/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 2745d5fd95..43ed41a205 100755
--- 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[64];
+uniform mat4 matrixPalette[32];
mat4 getObjectSkinnedTransform()
{