diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 09:41:10 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 09:41:10 -0400 |
| commit | 4bce553a96dc6d75279f2c2b35fb8060a3f6bae1 (patch) | |
| tree | 70c1b0c2b43f2649777eb8cac7eb927906034640 /indra/newview/llvovolume.cpp | |
| parent | a1fb8ae0d0679499a68fb8dd1965ab5026878c73 (diff) | |
| parent | 662a92784328f31b680f4f049350dd0f6cacf4c7 (diff) | |
merge viewer-development -> mesh-development
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index c5e2c56e4b..e6da8eb89d 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4495,6 +4495,11 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: S32 texture_index_channels = gGLManager.mNumTextureImageUnits-1; //always reserve one for shiny for now just for simplicity + if (gGLManager.mGLVersion < 3.1f) + { + texture_index_channels = 1; + } + if (LLPipeline::sRenderDeferred && distance_sort) { texture_index_channels = gDeferredAlphaProgram.mFeatures.mIndexedTextureChannels; |