From 0ab3e14ff05969f91ce24867a6ada45e53f6ecf5 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 26 Oct 2022 21:03:44 +0200
Subject: fix serialize tile atlas

---
 serialize/tile.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/serialize/tile.cpp b/serialize/tile.cpp
index 11473548..8a5374ab 100644
--- a/serialize/tile.cpp
+++ b/serialize/tile.cpp
@@ -17,7 +17,7 @@ using namespace floormat;
 namespace nlohmann {
 
 void adl_serializer<tile_image>::to_json(json& j, const tile_image& val) { using nlohmann::to_json; if (val.atlas) to_json(j, val); else j = nullptr; }
-void adl_serializer<tile_image>::from_json(const json& j, tile_image& val) { using nlohmann::from_json; from_json(j, val); }
+void adl_serializer<tile_image>::from_json(const json& j, tile_image& val) { using nlohmann::from_json; if (j.is_null()) val = {}; else from_json(j, val); }
 
 void adl_serializer<tile>::to_json(json& j, const tile& val) { using nlohmann::to_json; to_json(j, val); }
 void adl_serializer<tile>::from_json(const json& j, tile& val) { using nlohmann::from_json; from_json(j, val); }
-- 
cgit v1.2.3