diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-04-06 17:42:03 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-04-06 17:42:03 -0500 |
| commit | 8a8269cca90df5bb7d53086ed7a3c14cb8cd941e (patch) | |
| tree | 4dc827342d59773a4dcb808863ef71b96825aa71 /indra/llrender/llshadermgr.cpp | |
| parent | ecec1641ffe295c3bccbd0b4cb1bd2056b8a83e7 (diff) | |
| parent | de663d15df69aa6961f984f9f1c440f1fe2b3efb (diff) | |
merge
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 1286e91e49..23b76351eb 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -152,6 +152,14 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) return FALSE; } } + + if (features->hasObjectSkinning) + { + if (!shader->attachObject("avatar/objectSkinV.glsl")) + { + return FALSE; + } + } /////////////////////////////////////// // Attach Fragment Shader Features Next |