teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Swap the terrain cache update order to make more sense

Browse source
This commit is contained in:
scrawl 2016-02-09 21:17:10 +01:00
parent 9f729667fb
commit 98c5e072f2
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
components/terrain/terraingrid.cpp
View file

@ -260,17 +260,6 @@ void TerrainGrid::unloadCell(int x, int y)
void TerrainGrid::updateCache() void TerrainGrid::updateCache()
{ {
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mTextureCacheMutex);
for (TextureCache::iterator it = mTextureCache.begin(); it != mTextureCache.end();)
{
if (it->second->referenceCount() <= 1)
mTextureCache.erase(it++);
else
++it;
}
}
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mGridCacheMutex); OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mGridCacheMutex);
for (Grid::iterator it = mGridCache.begin(); it != mGridCache.end();) for (Grid::iterator it = mGridCache.begin(); it != mGridCache.end();)
@ -281,6 +270,17 @@ void TerrainGrid::updateCache()
++it; ++it;
} }
} }
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mTextureCacheMutex);
for (TextureCache::iterator it = mTextureCache.begin(); it != mTextureCache.end();)
{
if (it->second->referenceCount() <= 1)
mTextureCache.erase(it++);
else
++it;
}
}
} }
} }