diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-04-07 12:39:45 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-04-07 12:39:45 -0500 |
| commit | b6d3d2281b855448bbeec33b2d229222d75cd6b1 (patch) | |
| tree | 99b5c533bcf19a4b02247e601939346b6f2151df /indra/llrender/llshadermgr.cpp | |
| parent | 87cce27de3dd23a40d812a7c9000b1972cb4bca3 (diff) | |
| parent | 3b7b578733867efaeb9359df69df1fe400de0f10 (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 |