diff options
author | Oz Linden <oz@lindenlab.com> | 2013-04-25 16:54:49 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-04-25 16:54:49 -0400 |
commit | 6f953cc97b90eff43d69c2bda28fc9863fc57214 (patch) | |
tree | 326124bad515a7831631863d91348549568bb9ee /indra/llrender/llglslshader.cpp | |
parent | d7136bac52dc36cca1f5b89fdc26fd323be468c5 (diff) | |
parent | 3a2576cefa97f50640adb596a5d01fa287f7033f (diff) |
merge changes for latest rendering fixes
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
-rw-r--r-- | indra/llrender/llglslshader.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 191c9862f0..594edd43d5 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -280,6 +280,7 @@ void LLGLSLShader::unload() mTexture.clear(); mUniform.clear(); mShaderFiles.clear(); + mDefines.clear(); if (mProgramObject) { |