diff options
author | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
commit | 038f250caea80e21192372019dca8fdcf269c0d9 (patch) | |
tree | 2d5d0ec8fcc86886c27ffc58166183ce5f96be58 /indra/newview/app_settings/shaders/class1 | |
parent | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (diff) | |
parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) |
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/diffuseSkinnedV.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseSkinnedV.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseSkinnedV.glsl index a74290bfcd..2487110624 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseSkinnedV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseSkinnedV.glsl @@ -40,7 +40,7 @@ mat4 getObjectSkinnedTransform(); void main() { vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy; - + mat4 mat = getObjectSkinnedTransform(); mat = modelview_matrix * mat; |