From 017d9d2affd12000666cd0c3f56d6ebfd8bfa9f9 Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Mon, 25 Sep 2023 20:18:59 +0200 Subject: SL-20335 Disable ERROR # diffuseColor4fv : ASSERT (shader != NULL) --- indra/newview/lldrawpoolground.cpp | 6 +++--- indra/newview/llvosky.cpp | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/indra/newview/lldrawpoolground.cpp b/indra/newview/lldrawpoolground.cpp index 5b74264dab..77de386040 100644 --- a/indra/newview/lldrawpoolground.cpp +++ b/indra/newview/lldrawpoolground.cpp @@ -53,11 +53,11 @@ void LLDrawPoolGround::prerender() void LLDrawPoolGround::render(S32 pass) { - if (mDrawFace.empty() || !gSavedSettings.getBOOL("RenderGround")) + if (mDrawFace.empty() || !LLGLSLShader::sCurBoundShaderPtr || !gSavedSettings.getBOOL("RenderGround")) { return; - } - + } + LLGLSPipelineDepthTestSkyBox gls_skybox(true, false); gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 909588367b..cb2f8b6e18 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -767,7 +767,10 @@ bool LLVOSky::updateSky() mForceUpdate = FALSE; mForceUpdateThrottle.setTimerExpirySec(UPDATE_EXPRY); - gPipeline.markRebuild(gSky.mVOGroundp->mDrawable, LLDrawable::REBUILD_ALL, TRUE); + if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_GROUND)) + { + gPipeline.markRebuild(gSky.mVOGroundp->mDrawable, LLDrawable::REBUILD_ALL, TRUE); + } if (mDrawable.notNull() && mDrawable->getFace(0) && !mDrawable->getFace(0)->getVertexBuffer()) { -- cgit v1.2.3