diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-04-07 13:50:47 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-04-07 13:50:47 -0500 |
| commit | 666c7c429b7f38f7c93bf6c287157c2e3ab9ccd7 (patch) | |
| tree | 8f3e9399dbc5cab6c28c5992b579368bb0aa8949 /indra/newview/llviewershadermgr.h | |
| parent | 8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff) | |
| parent | b6d3d2281b855448bbeec33b2d229222d75cd6b1 (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; |