diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-01-11 17:27:45 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-01-11 17:27:45 -0800 |
| commit | 77565ce0c35fb35701bb51a82d70214a3ad56a12 (patch) | |
| tree | dbbb8284e0db98bcc3db829a9d3192e86f924ea0 /indra/llrender/llrender.cpp | |
| parent | a3ca95e3bd0e288792f6024d9487d618730fd40f (diff) | |
| parent | a74d494dd7c13e0307ee5ba526ba021583b1f2b5 (diff) | |
Merge with tip
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index fc45df8153..f97d81126e 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -162,6 +162,8 @@ void LLTexUnit::enable(eTextureType type) disable(); // Force a disable of a previous texture type if it's enabled. } mCurrTexType = type; + + gGL.flush(); glEnable(sGLTextureType[type]); } } |