diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-11 17:11:57 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-11 17:11:57 -0400 |
| commit | dc6c486dea4ad16c3ed3130549ef8d04bc0c251b (patch) | |
| tree | 793505e141c1352a0b1a7dc2e8ff73407658bdaf /indra/newview/lldrawpool.cpp | |
| parent | 25d23fcbeb784e1f1312195d9ea31ad59ee81dc4 (diff) | |
| parent | 8c5da0552db39ba6031b76ffb08994e53217a559 (diff) | |
reconciled .hgtags
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(); } |