From d46e9fb8bbbbe5eafa4100b8de81aeab924e8f1b Mon Sep 17 00:00:00 2001
From: Will <94789191+The-Stellar@users.noreply.github.com>
Date: Tue, 3 Sep 2024 00:27:28 +0100
Subject: [PATCH] Use custom normals in model replacement (#3649)

A small change that makes the models look a lot better.
Will likely cause a crash if imported model has no normal data, but
that's on the user to fix on their model.
---
 decompiler/level_extractor/merc_replacement.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/decompiler/level_extractor/merc_replacement.cpp b/decompiler/level_extractor/merc_replacement.cpp
index 1cc4205faa..07e2e2d4e9 100644
--- a/decompiler/level_extractor/merc_replacement.cpp
+++ b/decompiler/level_extractor/merc_replacement.cpp
@@ -131,9 +131,9 @@ void merc_convert_replacement(MercSwapData& out,
     x.pos[0] = y.x;
     x.pos[1] = y.y;
     x.pos[2] = y.z;
-    x.normal[0] = copy_from.normal[0];
-    x.normal[1] = copy_from.normal[1];
-    x.normal[2] = copy_from.normal[2];
+    x.normal[0] = in.normals.at(i).x();
+    x.normal[1] = in.normals.at(i).y();
+    x.normal[2] = in.normals.at(i).z();
     x.weights[0] = copy_from.weights[0];
     x.weights[1] = copy_from.weights[1];
     x.weights[2] = copy_from.weights[2];