diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-05-01 08:11:15 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-01 08:11:15 -0700 |
commit | 025c8909582f59f68f786d52bea06f5a272df0b5 (patch) | |
tree | 6d9980e216f89c74776155432b32e6778f3b6367 /indra/llrender | |
parent | 536a30d7f2083d39dbd6d06f16fa53064c3ee379 (diff) | |
parent | 70c1e21956b8589c9873ac5fa6a05467dc2e0a89 (diff) |
Merge vwr-dev-mat
Diffstat (limited to 'indra/llrender')
-rwxr-xr-x | indra/llrender/llshadermgr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index eceb4cb468..ef78d43665 100755 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -650,14 +650,14 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade text[count++] = strdup("#define shadow2DRect(a,b) vec2(texture(a,b))\n"); } } - + if (defines) { for (boost::unordered_map<std::string,std::string>::iterator iter = defines->begin(); iter != defines->end(); ++iter) - { - std::string define = "#define " + iter->first + " " + iter->second + "\n"; - text[count++] = (GLcharARB *) strdup(define.c_str()); - } + { + std::string define = "#define " + iter->first + " " + iter->second + "\n"; + text[count++] = (GLcharARB *) strdup(define.c_str()); + } } if (texture_index_channels > 0 && type == GL_FRAGMENT_SHADER_ARB) |