diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-30 01:26:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-30 01:26:27 -0500 |
| commit | 89473b2dc3ecfa8b813268833edddb5b0abd317d (patch) | |
| tree | 0252d59b1ee470ab36b0446da5c4d2e3827fbe1f /indra/llrender/llrender.cpp | |
| parent | 8c5fde7ae499a20c5cf2b51f575059dd01693ae8 (diff) | |
| parent | eca17c8993aecfd8d69c1b1765f8ac841ad29119 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 049dd4346b..0532510996 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -203,7 +203,9 @@ void LLTexUnit::disable(void) if (mCurrTexType != LLTexUnit::TT_MULTISAMPLE_TEXTURE && mIndex < gGLManager.mNumTextureUnits) { + stop_glerror(); glDisable(sGLTextureType[mCurrTexType]); + stop_glerror(); } mCurrTexType = TT_NONE; @@ -403,6 +405,7 @@ void LLTexUnit::unbind(eTextureType type) activate(); mCurrTexture = 0; glBindTexture(sGLTextureType[type], 0); + stop_glerror(); } } |