Skip to content
Snippets Groups Projects
Commit 3fa68c78 authored by David Parks's avatar David Parks
Browse files

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

parents d706766b 33016d36
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+ 1
− 1
View file @ 3fa68c78
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
ATTRIBUTE vec4 weight4; ATTRIBUTE vec4 weight4;
uniform mat4 matrixPalette[32]; uniform mat4 matrixPalette[64];
mat4 getObjectSkinnedTransform() mat4 getObjectSkinnedTransform()
{ {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment