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

Don't crash if star_brightness misses in a WL-Param set. Instead warn to log and exit the fuction gracefully.

Nicky 2012-08-28 23:52:30 +02:00
parent 48631db986
commit 33263bb5e7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/lldrawpoolwlsky.cpp
View File

@ -192,14 +192,18 @@ void LLDrawPoolWLSky::renderStars(void) const
bool error;
LLColor4 star_alpha(LLColor4::black);
star_alpha.mV[3] = LLWLParamManager::getInstance()->mCurParams.getFloat("star_brightness", error) / 2.f;
llassert_always(!error);
// If start_brightness is not set, exit
if( error )
{
llwarns << "star_brightness missing in mCurParams" << llendl;
return;
}
gGL.getTexUnit(0)->bind(gSky.mVOSkyp->getBloomTex());
gGL.pushMatrix();
gGL.rotatef(gFrameTimeSeconds*0.01f, 0.f, 0.f, 1.f);
// gl_FragColor.rgb = gl_Color.rgb;
// gl_FragColor.a = gl_Color.a * star_alpha.a;
if (LLGLSLShader::sNoFixedFunction)
{
gCustomAlphaProgram.bind();