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/newview/llviewershadermgr.h | |
| parent | ecec1641ffe295c3bccbd0b4cb1bd2056b8a83e7 (diff) | |
| parent | de663d15df69aa6961f984f9f1c440f1fe2b3efb (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
| -rw-r--r-- | indra/newview/llviewershadermgr.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index ac2b4624e0..83a650cdbc 100644 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -82,6 +82,7 @@ public: MATERIAL_COLOR = 0, SPECULAR_COLOR, BINORMAL, + OBJECT_WEIGHT, END_RESERVED_ATTRIBS } eGLSLReservedAttribs; @@ -313,6 +314,8 @@ extern LLGLSLShader gObjectFullbrightShinyProgram; extern LLGLSLShader gObjectShinyProgram; extern LLGLSLShader gObjectShinyWaterProgram; +extern LLGLSLShader gSkinnedObjectSimpleProgram; + //environment shaders extern LLGLSLShader gTerrainProgram; extern LLGLSLShader gTerrainWaterProgram; |