diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-29 06:18:02 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-29 06:18:02 +0100 |
| commit | 8b16faec3096e32b76b227efcb67fd33e7254f40 (patch) | |
| tree | 6519467cad0596fd02dbbad0a0f8970daa1ee1e3 /indra | |
| parent | 673eef187777f4283aa2f90027f1b2ee3dadebe0 (diff) | |
EXT-7543 FIXED(maybe) - crash in LLRenderPass::pushBatch
(transplanted from 3f95c322795af28d9b8f8730b9479a8925042039)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 711034a972..fb58b6affa 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -100,7 +100,10 @@ void LLStandardBumpmap::restoreGL() // static void LLStandardBumpmap::addstandard() { - llassert( LLStandardBumpmap::sStandardBumpmapCount == 0 ); + // can't assert; we destroyGL and restoreGL a lot during *first* startup, which populates this list already, THEN we explicitly init the list as part of *normal* startup. Sigh. So clear the list every time before we (re-)add the standard bumpmaps. + //llassert( LLStandardBumpmap::sStandardBumpmapCount == 0 ); + clear(); + llinfos << "Adding standard bumpmaps." << llendl; gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount++] = LLStandardBumpmap("None"); // BE_NO_BUMP gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount++] = LLStandardBumpmap("Brightness"); // BE_BRIGHTNESS gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount++] = LLStandardBumpmap("Darkness"); // BE_DARKNESS @@ -164,6 +167,7 @@ void LLStandardBumpmap::addstandard() // static void LLStandardBumpmap::clear() { + llinfos << "Clearing standard bumpmaps." << llendl; for( U32 i = 0; i < LLStandardBumpmap::sStandardBumpmapCount; i++ ) { gStandardBumpmapList[i].mLabel.assign(""); @@ -858,7 +862,7 @@ void LLDrawPoolBump::renderPostDeferred(S32 pass) } //////////////////////////////////////////////////////////////// -// List of one-component bump-maps created from other texures. +// List of bump-maps created from other textures. //const LLUUID TEST_BUMP_ID("3d33eaf2-459c-6f97-fd76-5fce3fc29447"); @@ -873,6 +877,7 @@ void LLBumpImageList::init() void LLBumpImageList::clear() { + llinfos << "Clearing dynamic bumpmaps." << llendl; // these will be re-populated on-demand mBrightnessEntries.clear(); mDarknessEntries.clear(); |