From 1cee1c24ec219a00f20bb5112771b77591f32844 Mon Sep 17 00:00:00 2001
From: ackwell <saxon@ackwell.com.au>
Date: Tue, 30 Jan 2024 21:39:12 +1100
Subject: [PATCH] Skip degenerate triangles targeted by shape keys

---
 Penumbra/Import/Models/Export/MeshExporter.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Penumbra/Import/Models/Export/MeshExporter.cs b/Penumbra/Import/Models/Export/MeshExporter.cs
index df315094..d3ca87dc 100644
--- a/Penumbra/Import/Models/Export/MeshExporter.cs
+++ b/Penumbra/Import/Models/Export/MeshExporter.cs
@@ -214,10 +214,18 @@ public class MeshExporter
             var morphBuilder = meshBuilder.UseMorphTarget(shapeNames.Count);
             shapeNames.Add(shape.ShapeName);
 
-            foreach (var shapeValue in shapeValues)
+            foreach (var (shapeValue, shapeValueIndex) in shapeValues.WithIndex())
             {
+                var gltfIndex = gltfIndices[shapeValue.BaseIndicesIndex - indexBase];
+
+                if (gltfIndex == -1)
+                {
+                    _notifier.Warning($"{name}: Shape {shape.ShapeName} mapping {shapeValueIndex} targets a degenerate triangle, ignoring.");
+                    continue;
+                }
+
                 morphBuilder.SetVertex(
-                    primitiveVertices[gltfIndices[shapeValue.BaseIndicesIndex - indexBase]].GetGeometry(),
+                    primitiveVertices[gltfIndex].GetGeometry(),
                     vertices[shapeValue.ReplacingVertexIndex].GetGeometry()
                 );
             }