Merge remote-tracking branch 'origin/master' into 1.6

# Conflicts: # Source/Tools/Flax.Build/Build/Builder.Projects.cs # Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs
2023-03-14 11:52:41 +01:00
parent b7a3b10498 1c27674fd5
commit 74758f5380
25 changed files with 545 additions and 196 deletions
--- a/Source/Editor/Cooker/Steps/CookAssetsStep.cpp
+++ b/Source/Editor/Cooker/Steps/CookAssetsStep.cpp
@@ -327,8 +327,8 @@ bool CookAssetsStep::ProcessDefaultAsset(AssetCookData& options)
    {
        // Use compact json
        rapidjson_flax::StringBuffer buffer;
-        rapidjson_flax::Writer<rapidjson_flax::StringBuffer> writer(buffer);
-        asJsonAsset->Document.Accept(writer);
+        CompactJsonWriter writerObj(buffer);
+        asJsonAsset->Save(writerObj);

        // Store json data in the first chunk
        auto chunk = New<FlaxChunk>();