From f07717240fb7206078086191267b0768bcb670c3 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Fri, 1 Mar 2024 23:39:09 +0100
Subject: [PATCH] Fix turning non-humans human with merged designs.

---
 Glamourer/State/StateEditor.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Glamourer/State/StateEditor.cs b/Glamourer/State/StateEditor.cs
index faaee58..92e6295 100644
--- a/Glamourer/State/StateEditor.cs
+++ b/Glamourer/State/StateEditor.cs
@@ -364,10 +364,13 @@ public class StateEditor(
 
     public void ApplyDesign(object data, DesignBase design, ApplySettings settings)
     {
-        var merged = settings.MergeLinks && design is Design d
-            ? merger.Merge(d.AllLinks, ((ActorState)data).ModelData.Customize, ((ActorState)data).BaseData, false,
-                Config.AlwaysApplyAssociatedMods)
-            : new MergedDesign(design);
+        var          state = (ActorState)data;
+        MergedDesign merged;
+        if (!settings.MergeLinks || design is not Design d)
+            merged = new MergedDesign(design);
+        else
+            merged = merger.Merge(d.AllLinks, state.ModelData.IsHuman ? state.ModelData.Customize : CustomizeArray.Default, state.BaseData,
+                false, Config.AlwaysApplyAssociatedMods);
 
         ApplyDesign(data, merged, settings with
         {