Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -495,18 +495,16 @@ void SDynTexture::ReleaseDynamicRT(bool bForce)
pSubset->erase(coTexture);
s_iNumTextureBytesCheckedOut -= m_pTexture->GetDataSize();
}
else
{
//assert(false);
int nnn = 0;
}
// Don't cache too many unused textures.
if (bForce)
{
s_nMemoryOccupied -= m_pTexture->GetDataSize();
assert(s_iNumTextureBytesCheckedOut + s_iNumTextureBytesCheckedIn == s_nMemoryOccupied);
int refCount = m_pTexture->Release();
#ifndef NDEBUG
int refCount =
#endif
m_pTexture->Release();
assert(refCount <= 0);
m_pTexture = NULL;
Unlink();