Merged in SL-12261 (pull request #193)
SL-12261 Remove redrawing of sky twice and timer causing it not to be re-drawn twice 2% of the time Approved-by: Dave Houltonmeow-7.2.2
commit
8e1eb129f2
|
|
@ -123,23 +123,12 @@ void LLDrawPoolSky::renderSkyFace(U8 index)
|
|||
return;
|
||||
}
|
||||
|
||||
F32 interp_val = gSky.mVOSkyp ? gSky.mVOSkyp->getInterpVal() : 0.0f;
|
||||
|
||||
if (index < 6) // sky tex...interp
|
||||
{
|
||||
llassert(mSkyTex);
|
||||
mSkyTex[index].bindTexture(true); // bind the current tex
|
||||
|
||||
face->renderIndexed();
|
||||
|
||||
if (interp_val > 0.01f) // iff, we've got enough info to lerp (a to and a from)
|
||||
{
|
||||
LLGLEnable blend(GL_BLEND);
|
||||
llassert(mSkyTex);
|
||||
mSkyTex[index].bindTexture(false); // bind the "other" texture
|
||||
gGL.diffuseColor4f(1, 1, 1, interp_val); // lighting is disabled
|
||||
face->renderIndexed();
|
||||
}
|
||||
}
|
||||
else // heavenly body faces, no interp...
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue