diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-05-20 17:41:00 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-05-20 17:41:00 +0200 |
| commit | 1300f77fdd48d90d09a05058ffdf10df93092391 (patch) | |
| tree | 1cefd5cb64be5ae614b4930dcd0a55cf4fc06109 /indra/newview/llvovolume.cpp | |
| parent | 8199cc997aeaccc72b5bd5389ded8afc7b9c379c (diff) | |
| parent | aa0a0542a10ba6faeca34afd6e323b505493d8dc (diff) | |
Merged with viewer-beta
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 438d578ac5..e7c35d8220 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4714,11 +4714,11 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: buffer_index = -1; } - S32 texture_index_channels = LLGLSLShader::sIndexedTextureChannels-1; //always reserve one for shiny for now just for simplicity + S32 texture_index_channels = 1; - if (gGLManager.mGLVersion < 3.1f) + if (gGLManager.mGLSLVersionMajor > 1 || gGLManager.mGLSLVersionMinor >= 30) { - texture_index_channels = 1; + texture_index_channels = LLGLSLShader::sIndexedTextureChannels-1; //always reserve one for shiny for now just for simplicity; } if (LLPipeline::sRenderDeferred && distance_sort) |