diff options
author | callum <none@none> | 2012-04-10 15:32:13 -0700 |
---|---|---|
committer | callum <none@none> | 2012-04-10 15:32:13 -0700 |
commit | ea335aedd5f944c0d04eb12b214a1778512d63b2 (patch) | |
tree | 0476e640006139b2cc6ac16a11a7666e3d73a692 /indra/newview/llviewershadermgr.h | |
parent | a6fc0f63bff7f329cb77e86677af92a1cf5efb47 (diff) | |
parent | f96a6aad6b266c8cd4b1a117510fd4cacb6413c8 (diff) |
Merge with head
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
-rw-r--r-- | indra/newview/llviewershadermgr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index 95eb551bf1..d10aba85c7 100644 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -216,6 +216,7 @@ extern LLGLSLShader gGlowCombineProgram; extern LLGLSLShader gSplatTextureRectProgram; extern LLGLSLShader gGlowCombineFXAAProgram; extern LLGLSLShader gDebugProgram; +extern LLGLSLShader gClipProgram; extern LLGLSLShader gAlphaMaskProgram; //output tex0[tc0] + tex1[tc1] |