diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-10 18:31:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-10 18:31:07 +0300 |
| commit | 737bf1ba9431aa35e2e510c5de76fd6a632c61b8 (patch) | |
| tree | 08e343c11fccda03b28aaf2cec34a06c98d8aa77 /indra/llrender/llshadermgr.cpp | |
| parent | 34dfd7d5996b1b6117c2155bb95aeb377038bb6e (diff) | |
| parent | 13b08c8ae1c3b92236f156fba5686f231abfb711 (diff) | |
Merge pull request #1676 from Ansariel/DRTVWR-600-maint-A
Re-enable compiler warnings C4018, C4100, C4231 and C4506
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 6ac2b62777..0f08466c33 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -665,7 +665,7 @@ GLuint LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shader_lev { //switches are supported in GLSL 1.30 and later if (gGLManager.mIsNVIDIA) { //switches are unreliable on some NVIDIA drivers - for (U32 i = 0; i < texture_index_channels; ++i) + for (S32 i = 0; i < texture_index_channels; ++i) { std::string if_string = llformat("\t%sif (vary_texture_index == %d) { return texture(tex%d, texcoord); }\n", i > 0 ? "else " : "", i, i); extra_code_text[extra_code_count++] = strdup(if_string.c_str()); |