diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-30 19:37:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-30 19:37:56 -0400 |
| commit | 662a92784328f31b680f4f049350dd0f6cacf4c7 (patch) | |
| tree | 81c6c9634d919941e683f5d2e3ca0dd8c0c655cd /indra/newview/llvovolume.cpp | |
| parent | 6be68618c4b32082228d9c34083542017b84482f (diff) | |
| parent | 7a85df942916b8387fd822a9e22cb0857c258be5 (diff) | |
merge changes for shining branch
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; |