From 784d3aafb6fdd98e81c07bf1482f458c7978f749 Mon Sep 17 00:00:00 2001
From: Alan Tse <alandtse@gmail.com>
Date: Sun, 10 Sep 2023 20:10:37 -0700
Subject: [PATCH 1/2] refactor: remove redundant state load

---
 src/XSEPlugin.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/XSEPlugin.cpp b/src/XSEPlugin.cpp
index ccbe1075e4..21636a32fb 100644
--- a/src/XSEPlugin.cpp
+++ b/src/XSEPlugin.cpp
@@ -98,9 +98,6 @@ void MessageHandler(SKSE::MessagingInterface::Message* message)
 				shaderCache.SetAsync(true);
 				shaderCache.SetDiskCache(true);
 				shaderCache.SetDump(false);
-
-				State::GetSingleton()->Load();
-
 				shaderCache.ValidateDiskCache();
 
 				if (LightLimitFix::GetSingleton()->loaded) {

From b783067072283c57edfd950be25458484386915b Mon Sep 17 00:00:00 2001
From: Alan Tse <alandtse@gmail.com>
Date: Sun, 10 Sep 2023 20:18:33 -0700
Subject: [PATCH 2/2] fix: set bLandSpecular to support Terrain Parallax

bLandSpecular may be disabled by certain mod lists and is necessary for
terrain parallax. This will force the setting to true when Terrain
Parallax is enabled.
---
 src/Features/ExtendedMaterials.cpp | 18 +++++++++++++++++-
 src/Features/ExtendedMaterials.h   |  2 ++
 src/XSEPlugin.cpp                  |  2 ++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/Features/ExtendedMaterials.cpp b/src/Features/ExtendedMaterials.cpp
index f3463fef37..ccc9c608b6 100644
--- a/src/Features/ExtendedMaterials.cpp
+++ b/src/Features/ExtendedMaterials.cpp
@@ -14,6 +14,18 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(
 	ShadowsStartFade,
 	ShadowsEndFade)
 
+void ExtendedMaterials::DataLoaded()
+{
+	if (&settings.EnableTerrain) {
+		if (auto bLandSpecular = RE::INISettingCollection::GetSingleton()->GetSetting("bLandSpecular:Landscape"); bLandSpecular) {
+			if (!bLandSpecular->data.b) {
+				logger::info("[CPM] Changing bLandSpecular from {} to {} to support Terrain Parallax", bLandSpecular->data.b, true);
+				bLandSpecular->data.b = true;
+			}
+		}
+	}
+}
+
 void ExtendedMaterials::DrawSettings()
 {
 	if (ImGui::TreeNodeEx("Complex Material", ImGuiTreeNodeFlags_DefaultOpen)) {
@@ -43,7 +55,11 @@ void ExtendedMaterials::DrawSettings()
 			ImGui::EndTooltip();
 		}
 
-		ImGui::Checkbox("Enable Terrain", (bool*)&settings.EnableTerrain);
+		if (ImGui::Checkbox("Enable Terrain", (bool*)&settings.EnableTerrain)) {
+			if (settings.EnableTerrain) {
+				DataLoaded();
+			}
+		}
 		if (ImGui::IsItemHovered()) {
 			ImGui::BeginTooltip();
 			ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f);
diff --git a/src/Features/ExtendedMaterials.h b/src/Features/ExtendedMaterials.h
index 14f1836c7b..0fb448d8c0 100644
--- a/src/Features/ExtendedMaterials.h
+++ b/src/Features/ExtendedMaterials.h
@@ -47,6 +47,8 @@ struct ExtendedMaterials : Feature
 	virtual void SetupResources();
 	virtual inline void Reset() {}
 
+	void DataLoaded();
+
 	virtual void DrawSettings();
 
 	void ModifyLighting(const RE::BSShader* shader, const uint32_t descriptor);
diff --git a/src/XSEPlugin.cpp b/src/XSEPlugin.cpp
index 21636a32fb..0c30f81bd2 100644
--- a/src/XSEPlugin.cpp
+++ b/src/XSEPlugin.cpp
@@ -130,6 +130,8 @@ void MessageHandler(SKSE::MessagingInterface::Message* message)
 
 				if (LightLimitFix::GetSingleton()->loaded)
 					LightLimitFix::GetSingleton()->DataLoaded();
+				if (ExtendedMaterials::GetSingleton()->loaded)
+					ExtendedMaterials::GetSingleton()->DataLoaded();
 			}
 
 			break;