Merge commit '4ea4a61d542777a270c4e2c283e0e986fc9eec9c'

deps/ox/src/ox/std/smallmap.hpp

@@ -85,6 +85,11 @@ class SmallMap {
 			return m_pairs;
 		}
 
+		[[nodiscard]]
+		constexpr ox::Span<Pair> pairs() noexcept {
+			return m_pairs;
+		}
+
 		constexpr void clear();
 
 	private:

src/olympic/keel/src/media.cpp

@@ -154,13 +154,12 @@ ox::Result<ox::CStringView> uuidToPath(Context &ctx, ox::UUID const&uuid) noexce
 }
 
 ox::Error reloadAsset(keel::Context &ctx, ox::StringViewCR assetId) noexcept {
-	ox::UUIDStr uuidStr;
 	if (beginsWith(assetId, "uuid://")) {
 		return ctx.assetManager.reloadAsset(substr(assetId, 7));
 	} else {
-		auto const [uuid, uuidErr] =  getUuid(ctx, assetId);
+		auto const [uuid, uuidErr] = getUuid(ctx, assetId);
 		if (!uuidErr) {
-			return ctx.assetManager.reloadAsset(uuidStr);
+			return ctx.assetManager.reloadAsset(uuid.toString());
 		} else {
 			return ctx.assetManager.reloadAsset(assetId);
 		}