diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-03-07 21:32:00 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-03-07 21:32:00 +0000 |
| commit | 2d8152afd9c6077b5eda8d139521a4e3c1328775 (patch) | |
| tree | 70b4bef224d91443fd4411cacc4ee10cf5d41309 /indra/llrender/llglslshader.cpp | |
| parent | 88b53a26ce633bfc07f9990e9dc1e9c85dd31414 (diff) | |
| parent | 423fa1ac297e39c9395f45490278b8751188b6db (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #298)
SL-10618, SL-10698
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 528f23b3ee..9a4eeb59df 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -695,6 +695,11 @@ void LLGLSLShader::mapUniform(GLint index, const vector<LLStaticHashedString> * } } +void LLGLSLShader::clearPermutations() +{ + mDefines.clear(); +} + void LLGLSLShader::addPermutation(std::string name, std::string value) { mDefines[name] = value; |