From 065b6d3331d7190746cba67d479d8f9e552d6472 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 18 Feb 2014 12:03:35 +0100
Subject: [PATCH] Terrain: moved ESM::Land load to earlier in the startup
 procedure

Required for background loading as we cannot load ESM::Land data from background threads.
---
 apps/openmw/mwrender/globalmap.cpp      | 7 +++----
 apps/openmw/mwrender/terrainstorage.cpp | 7 -------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index 018dc082a3..76ad1890fa 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -75,10 +75,9 @@ namespace MWRender
 
                     if (land)
                     {
-                        if (!land->isDataLoaded(ESM::Land::DATA_VHGT))
-                        {
-                            land->loadData(ESM::Land::DATA_VHGT);
-                        }
+                        int mask = ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX;
+                        if (!land->isDataLoaded(mask))
+                            land->loadData(mask);
                     }
 
                     for (int cellY=0; cellY<cellSize; ++cellY)
diff --git a/apps/openmw/mwrender/terrainstorage.cpp b/apps/openmw/mwrender/terrainstorage.cpp
index 2ccf3bd0a7..8597c762c5 100644
--- a/apps/openmw/mwrender/terrainstorage.cpp
+++ b/apps/openmw/mwrender/terrainstorage.cpp
@@ -46,10 +46,6 @@ namespace MWRender
         const MWWorld::ESMStore &esmStore =
             MWBase::Environment::get().getWorld()->getStore();
         ESM::Land* land = esmStore.get<ESM::Land>().search(cellX, cellY);
-        // Load the data we are definitely going to need
-        int mask = ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX;
-        if (land && !land->isDataLoaded(mask))
-            land->loadData(mask);
         return land;
     }
 
@@ -316,9 +312,6 @@ namespace MWRender
         ESM::Land* land = getLand(cellX, cellY);
         if (land)
         {
-            if (!land->isDataLoaded(ESM::Land::DATA_VTEX))
-                land->loadData(ESM::Land::DATA_VTEX);
-
             int tex = land->mLandData->mTextures[y * ESM::Land::LAND_TEXTURE_SIZE + x];
             if (tex == 0)
                 return std::make_pair(0,0); // vtex 0 is always the base texture, regardless of plugin