diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-08-15 20:35:39 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-08-15 20:35:39 +0300 |
| commit | fecec49081419dbd7a66533e4d0457784b8d26a0 (patch) | |
| tree | 457018dc36300b5c2a355aedd771861d6b300697 /indra/newview/lldrawpool.cpp | |
| parent | c70a357a274d5acd7921c3185dc34b89069d4e61 (diff) | |
| parent | 5c0df02df5abdadbf17235ae5d7208963c25f1ce (diff) | |
Merge
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
| -rw-r--r-- | indra/newview/lldrawpool.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index fa7d6e2a40..286284f828 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -190,15 +190,16 @@ void LLDrawPool::renderPostDeferred(S32 pass) //virtual void LLDrawPool::endRenderPass( S32 pass ) { - for (U32 i = 0; i < gGLManager.mNumTextureImageUnits; i++) + /*for (U32 i = 0; i < gGLManager.mNumTextureImageUnits; i++) { //dummy cleanup of any currently bound textures if (gGL.getTexUnit(i)->getCurrType() != LLTexUnit::TT_NONE) { gGL.getTexUnit(i)->unbind(gGL.getTexUnit(i)->getCurrType()); gGL.getTexUnit(i)->disable(); } - } + }*/ + //make sure channel 0 is active channel gGL.getTexUnit(0)->activate(); } |