diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-05-10 17:47:15 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-05-10 17:47:15 -0500 |
| commit | e8067c6f8b6cb733c20aa0a002546298bfc88afa (patch) | |
| tree | 1d2b4b39786b1f1291f322215174cb375d371d0d /indra/llrender | |
| parent | f6c03a46731ad0af301ae2c8505050d9e514a7d4 (diff) | |
| parent | ee7c2396e24a81295cc1665a38845a41a2b81e23 (diff) | |
merge
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llrender.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 43662fbb5c..2472339ec4 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -165,6 +165,7 @@ void LLTexUnit::enable(eTextureType type) if ( (mCurrTexType != type || gGL.mDirty) && (type != TT_NONE) ) { activate(); + if (mCurrTexType != TT_NONE && !gGL.mDirty) { disable(); // Force a disable of a previous texture type if it's enabled. |