From dfcbee3ab162e5c7ff8809bb753dafc083848548 Mon Sep 17 00:00:00 2001
From: Kyle Cooley <kyleacooley@gmail.com>
Date: Sat, 30 Sep 2017 00:04:52 -0400
Subject: [PATCH] Ignore case when comparing textures, also add new textures to
 lookup map.

---
 apps/opencs/model/world/idtable.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 54d65ac3f..bde5af3d9 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -1,5 +1,7 @@
 #include "idtable.hpp"
 
+#include <algorithm>
+#include <cctype>
 #include <cstdint>
 #include <limits>
 #include <map>
@@ -346,8 +348,10 @@ CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::import
     for (int i = 0; i < idCollection()->getSize(); ++i)
     {
         auto& record = static_cast<const Record<LandTexture>&>(idCollection()->getRecord(i));
+        std::string texture = record.get().mTexture;
+        std::transform(texture.begin(), texture.end(), texture.begin(), tolower);
         if (record.isModified())
-            reverseLookupMap.emplace(record.get().mTexture, idCollection()->getId(i));
+            reverseLookupMap.emplace(texture, idCollection()->getId(i));
     }
 
     for (const std::string& id : ids)
@@ -366,7 +370,9 @@ CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::import
 
         // Look for a pre-existing record
         auto& record = static_cast<const Record<LandTexture>&>(idCollection()->getRecord(oldRow));
-        auto searchIt = reverseLookupMap.find(record.get().mTexture);
+        std::string texture = record.get().mTexture;
+        std::transform(texture.begin(), texture.end(), texture.begin(), tolower);
+        auto searchIt = reverseLookupMap.find(texture);
         if (searchIt != reverseLookupMap.end())
         {
             results.recordMapping.push_back(std::make_pair(id, searchIt->second));
@@ -385,6 +391,7 @@ CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::import
                 cloneRecord(id, newId, UniversalId::Type_LandTexture);
                 results.createdRecords.push_back(newId);
                 results.recordMapping.push_back(std::make_pair(id, newId));
+                reverseLookupMap.emplace(texture, newId);
                 break;
             }