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

Avoid potentially loading the standard bumpmap list twice during startup. 

(transplanted from 6dfc8d6ec39f6f3af4495c27546054f311b884af)
master
Tofu Linden 2010-05-21 16:09:22 +01:00
parent 4bfe01fc3c
commit bcccf04584
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lldrawpoolbump.cpp
View File

@ -82,7 +82,7 @@ static S32 bump_channel = -1;
// static
void LLStandardBumpmap::init()
{
LLStandardBumpmap::restoreGL();
// do nothing
}
// static
@ -835,6 +835,8 @@ void LLBumpImageList::clear()
// these will be re-populated on-demand
mBrightnessEntries.clear();
mDarknessEntries.clear();
LLStandardBumpmap::clear();
}
void LLBumpImageList::shutdown()
@ -851,8 +853,8 @@ void LLBumpImageList::destroyGL()
void LLBumpImageList::restoreGL()
{
// Images will be recreated as they are needed.
LLStandardBumpmap::restoreGL();
// Images will be recreated as they are needed.
}