diff --git a/DataSpec/DNACommon/CMDL.cpp b/DataSpec/DNACommon/CMDL.cpp index 7f4cb2ffa..e5cbfe34b 100644 --- a/DataSpec/DNACommon/CMDL.cpp +++ b/DataSpec/DNACommon/CMDL.cpp @@ -1634,14 +1634,14 @@ bool WriteMREASecs(std::vector>& secsOut, const hecl::Proje /* Iterate meshes */ auto matIt = surfToGlobalMats.cbegin(); for (const Mesh& mesh : meshes) { - zeus::CTransform meshXf(mesh.sceneXf.val); + zeus::CTransform meshXf(mesh.sceneXf.val.data()); meshXf.basis.transpose(); /* Header */ { MeshHeader meshHeader = {}; meshHeader.visorFlags.setFromBlenderProps(mesh.customProps); - memmove(meshHeader.xfMtx, &mesh.sceneXf, 48); + memmove(meshHeader.xfMtx, mesh.sceneXf.val.data(), 48); zeus::CAABox aabb(zeus::CVector3f(mesh.aabbMin), zeus::CVector3f(mesh.aabbMax)); aabb = aabb.getTransformedAABox(meshXf); @@ -1912,14 +1912,14 @@ bool WriteHMDLMREASecs(std::vector>& secsOut, const hecl::P /* Iterate meshes */ auto matIt = surfToGlobalMats.cbegin(); for (const Mesh& mesh : meshes) { - zeus::CTransform meshXf(mesh.sceneXf.val); + zeus::CTransform meshXf(mesh.sceneXf.val.data()); meshXf.basis.transpose(); /* Header */ { MeshHeader meshHeader = {}; meshHeader.visorFlags.setFromBlenderProps(mesh.customProps); - memmove(meshHeader.xfMtx, &mesh.sceneXf, 48); + memmove(meshHeader.xfMtx, mesh.sceneXf.val.data(), 48); zeus::CAABox aabb(zeus::CVector3f(mesh.aabbMin), zeus::CVector3f(mesh.aabbMax)); aabb = aabb.getTransformedAABox(meshXf); diff --git a/hecl b/hecl index b4efa8667..4725be4d1 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit b4efa8667f81e9e9384321a9f77df0059b7f8915 +Subproject commit 4725be4d1c93263d0f24f4616bce4d30ea0f05da