diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-26 18:32:12 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-26 18:32:12 -0500 |
| commit | 8dbfa022778f2a7fcd5d2b527045724551279412 (patch) | |
| tree | 4e88cb98b66cff493887a93572ffc4c39c951a8e /indra/llrender/llgl.cpp | |
| parent | c7a16ef091409f55427f7cf0e9057130b47d2574 (diff) | |
| parent | 54ba56dbe995a3d215f85932c83948145a871ac4 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 59c63d8465..189a460001 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -650,7 +650,7 @@ bool LLGLManager::initGL() if (LLRender::sGLCoreProfile) { - mNumTextureUnits = mNumTextureImageUnits; + mNumTextureUnits = llmin(mNumTextureImageUnits, MAX_GL_TEXTURE_UNITS); } else if (mHasMultitexture) { |