diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-10-07 16:07:37 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-10-07 16:07:37 -0400 |
| commit | fb675e81854c68172642446398c0743bacc8bd41 (patch) | |
| tree | 480ed27223a3785b411d9b28c0108ace1c70816e /indra/newview/lldrawpoolsky.cpp | |
| parent | 623ac79120a417ec445ce5c106a907fe46734309 (diff) | |
| parent | 027ca696bd7bf222be63cf4d0af6e975b83a6815 (diff) | |
SL-16024: Merge branch 'DRTVWR-546' into SL-16024-to-546
Diffstat (limited to 'indra/newview/lldrawpoolsky.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolsky.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp index b6f55e800a..b1eefaab81 100644 --- a/indra/newview/lldrawpoolsky.cpp +++ b/indra/newview/lldrawpoolsky.cpp @@ -82,13 +82,7 @@ void LLDrawPoolSky::render(S32 pass) } else { - // don't use shaders! - if (gGLManager.mHasShaderObjects) - { - // Ironically, we must support shader objects to be - // able to use this call. - LLGLSLShader::bindNoShader(); - } + LLGLSLShader::bindNoShader(); mShader = NULL; } |