diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-04 15:45:24 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-04 15:45:24 +0200 |
| commit | 0ae5368cc61f8ce95a186e6c2268b1e0a8d59c14 (patch) | |
| tree | 2beb159778842156fad344e55ce8e00de397b6d2 /indra/llrender/llglslshader.cpp | |
| parent | 36a44ba0e9133e78cc66f7d0b65d0890cfeb3db5 (diff) | |
| parent | 56ca1aebb866b7d7e1526e31797dd7e07fcb74a8 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 830617063b..ca92cb6580 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -70,7 +70,7 @@ hasGamma(false), hasLighting(false), calculatesAtmospherics(false) // LLGLSL Shader implementation //=============================== LLGLSLShader::LLGLSLShader() -: mProgramObject(0), mShaderLevel(0), mShaderGroup(SG_DEFAULT) + : mProgramObject(0), mActiveTextureChannels(0), mShaderLevel(0), mShaderGroup(SG_DEFAULT), mUniformsDirty(FALSE) { } |