From 98c5e072f29990d8de48533ebed6f684dce7f5cc Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 21:17:10 +0100
Subject: [PATCH] Swap the terrain cache update order to make more sense

---
 components/terrain/terraingrid.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 5b1854abc3..f40f3a3884 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -260,17 +260,6 @@ void TerrainGrid::unloadCell(int x, int y)
 
 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);
         for (Grid::iterator it = mGridCache.begin(); it != mGridCache.end();)
@@ -281,6 +270,17 @@ void TerrainGrid::updateCache()
                 ++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;
+        }
+    }
 }
 
 }