diff options
author | Graham Linden <graham@lindenlab.com> | 2019-03-13 13:21:48 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-03-13 13:21:48 -0700 |
commit | 898c9f44218353b3bf71b78ffce02662b4927625 (patch) | |
tree | 2793682ba7d69d34730a4aeced04100312a479a2 /indra/llrender/llglslshader.cpp | |
parent | 868cd32e5e229e503f1b5b1d5ec543fd6f76cb7f (diff) |
Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.
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 471d73febf..8f3a56e1cf 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -401,7 +401,7 @@ BOOL LLGLSLShader::createShader(std::vector<LLStaticHashedString> * attributes, // work-around missing mix(vec3,vec3,bvec3) mDefines["OLD_SELECT"] = "1"; #endif - + //compile new source vector< pair<string,GLenum> >::iterator fileIter = mShaderFiles.begin(); for ( ; fileIter != mShaderFiles.end(); fileIter++ ) |