GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Update Newtonsoft.Json to 13.0.2 and .Net 7

Browse Source
This commit is contained in:
Wojciech Figat
2022-12-17 13:38:30 +01:00
parent 889eb7d846
commit 84a68c5977
10 changed files with 547 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Engine/Serialization/JsonSerializer.cs
View File

@@ -101,13 +101,8 @@ namespace FlaxEngine.Json
/// <returns>True if both objects are equal, otherwise false.</returns>
public static bool ValueEquals(object objA, object objB)
{
// If referenced object has the same linkage to the prefab object as the default value used in SerializeDiff, then mark it as equal
/*if (objA is ISceneObject sceneObjA && objB is ISceneObject sceneObjB && (sceneObjA.HasPrefabLink || sceneObjB.HasPrefabLink))
{
return sceneObjA.PrefabObjectID == sceneObjB.PrefabObjectID;
}*/
return Newtonsoft.Json.Utilities.MiscellaneousUtils.DefaultValueEquals(objA, objB);
// Use default value comparision used by C# json serialization library
return Newtonsoft.Json.Utilities.MiscellaneousUtils.ValueEquals(objA, objB);
}
/// <summary>