livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-20335 Disable ERROR # diffuseColor4fv : ASSERT (shader != NULL)

meow-7.2.2
Alexander Gavriliuk 2023-09-25 20:18:59 +02:00 committed by Guru
parent 3ff0cd546a
commit 017d9d2aff
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lldrawpoolground.cpp
View File

@ -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);

5
indra/newview/llvosky.cpp
View File

@ -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())
{