From 94bb3677541c2cd133d7f038a95a90428b37d14d Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:11:24 +0200 Subject: [PATCH] GameModelImporter - Check model metadata before conversion --- PCK-Studio/Internal/GameModelImporter.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PCK-Studio/Internal/GameModelImporter.cs b/PCK-Studio/Internal/GameModelImporter.cs index 9f6c4a7d..762e8fde 100644 --- a/PCK-Studio/Internal/GameModelImporter.cs +++ b/PCK-Studio/Internal/GameModelImporter.cs @@ -53,6 +53,12 @@ namespace PckStudio.Internal Vector3 transformAxis = new Vector3(1, 1, 0); + if (!ModelMetaData.TryGetValue(modelInfo.Model.Name, out JsonModelMetaData modelMetaData)) + { + Trace.TraceError($"[{nameof(GameModelImporter)}:{nameof(ExportBlockBenchModel)}] Failed to get model meta data for '{modelInfo.Model.Name}'."); + return; + } + foreach (ModelPart part in modelInfo.Model.Parts.Values) { var outline = new Outline(part.Name); @@ -74,12 +80,6 @@ namespace PckStudio.Internal outliners.Add(part.Name, outline); } - if (!ModelMetaData.TryGetValue(modelInfo.Model.Name, out JsonModelMetaData modelMetaData)) - { - Trace.TraceError($"[{nameof(GameModelImporter)}:{nameof(ExportBlockBenchModel)}] Failed to get model meta data for '{modelInfo.Model.Name}'."); - return; - } - TraverseChildren(modelMetaData.RootParts, ref outliners); blockBenchModel.Elements = elements.ToArray();