EXT-7479 FIXED only bumpmaps of type Brightness or Darkness load on 2.0.2 (205107)

meow-7.2.2
Tofu Linden 2010-05-26 16:46:55 +01:00
parent 12cf211241
commit 94bddd2b44
2 changed files with 4 additions and 5 deletions

View File

@ -82,7 +82,7 @@ static S32 bump_channel = -1;
// static
void LLStandardBumpmap::init()
{
// do nothing
LLStandardBumpmap::restoreGL();
}
// static

View File

@ -118,10 +118,9 @@ static bool handleTerrainDetailChanged(const LLSD& newvalue)
static bool handleSetShaderChanged(const LLSD& newvalue)
{
// changing shader level may invalidate existing cached bump maps, as the shader type determines the format of the bump map it expects - clear the bump cache
gBumpImageList.clear();
LLStandardBumpmap::clear();
LLStandardBumpmap::addstandard();
// changing shader level may invalidate existing cached bump maps, as the shader type determines the format of the bump map it expects - clear and repopulate the bump cache
gBumpImageList.destroyGL();
gBumpImageList.restoreGL();
LLViewerShaderMgr::instance()->setShaders();
return true;