From b67b95767b7bfcd5f618ebc8e14ddbc83edcbe36 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 31 Jul 2025 00:41:06 -0500 Subject: [PATCH] Squashed 'deps/nostalgia/' changes from f7c3c02c..e38b85b4 e38b85b4 [studio] Eliminate redundant serialization and deserialization git-subtree-dir: deps/nostalgia git-subtree-split: e38b85b4f4134af04b9b71caddcd2268f425f5df --- src/olympic/studio/modlib/include/studio/project.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/olympic/studio/modlib/include/studio/project.hpp b/src/olympic/studio/modlib/include/studio/project.hpp index f514e3c..aa56bb0 100644 --- a/src/olympic/studio/modlib/include/studio/project.hpp +++ b/src/olympic/studio/modlib/include/studio/project.hpp @@ -185,14 +185,13 @@ ox::Error Project::writeObj(ox::StringViewCR path, T const &obj) noexcept { template ox::Result Project::loadObj(ox::StringViewCR path) const noexcept { - OX_REQUIRE_M(buff, loadBuff(path)); + OX_REQUIRE(buff, loadBuff(path)); if constexpr(ox::is_same_v) { return keel::readAsset(m_typeStore, buff); } else { OX_REQUIRE(typeId, keel::readAssetTypeId(buff)); if (typeId != ox::ModelTypeId_v) { - OX_REQUIRE(ah, keel::readAssetHeader(buff)); - OX_RETURN_ERROR(keel::convertBuffToBuff(m_kctx, buff, ah.clawHdr.fmt).moveTo(buff)); + return keel::convert(m_kctx, buff); } return keel::readAsset(buff); }