diff options
| author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-03-17 01:53:46 +1100 |
|---|---|---|
| committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-03-17 01:53:46 +1100 |
| commit | 53c7c3775fae0810b0831297b50aab1b0a1ef4e0 (patch) | |
| tree | ee8153e55810085d6ed07a64efb6a17c1fa87a2f /source/core/StarJson.hpp | |
| parent | 463205c09cc393e92ae2f51b9bc8f61c4e368dea (diff) | |
Lua: new Image userdata (& cursor mod fix)
Diffstat (limited to 'source/core/StarJson.hpp')
| -rw-r--r-- | source/core/StarJson.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/core/StarJson.hpp b/source/core/StarJson.hpp index 085fd9f..a533e47 100644 --- a/source/core/StarJson.hpp +++ b/source/core/StarJson.hpp @@ -291,6 +291,8 @@ DataStream& operator>>(DataStream& ds, JsonObject& m); // is the combination of both objects, but for each repeated key jsonMerge is // called recursively on both values to determine the result. Json jsonMerge(Json const& base, Json const& merger); +// Same as above, but applies null mergers. +Json jsonMergeNulling(Json const& base, Json const& merger); template <typename... T> Json jsonMerge(Json const& base, Json const& merger, T const&... rest); |