From 4189c596ef9e26dd8a8958d2ea8349d7318cb7a5 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sat, 3 Apr 2021 22:07:47 -0700 Subject: [PATCH] Don't use the CSKR in the .blend file for the beta phazon suit, this fixes the normal Phazon Suit being improperly skinned --- DataSpec/DNACommon/CMDL.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/DataSpec/DNACommon/CMDL.cpp b/DataSpec/DNACommon/CMDL.cpp index e889601bb..99ed68f95 100644 --- a/DataSpec/DNACommon/CMDL.cpp +++ b/DataSpec/DNACommon/CMDL.cpp @@ -1002,7 +1002,10 @@ atUint32 ReadGeomSectionsToBlender(hecl::blender::PyOutStream& os, athena::io::I FinishBlenderMesh(os, matSetCount, meshIdx); if (rp.first.second) { - os.format(FMT_STRING("mesh.cskr_id = '{}'\n"), rp.first.first); + if (entry.id != 0xB333E1D7) { + // This is the beta phazon suit, we want the (incorrect) weight information, but we don't want to keep the CSKR id + os.format(FMT_STRING("mesh.cskr_id = '{}'\n"), rp.first.first); + } rp.second.second->sendVertexGroupsToBlender(os); }