From e6074149e52303d26b1a988dcdfbcdfa28969b44 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Sat, 29 May 2021 13:48:38 +0200 Subject: [PATCH] Fix Margin loading --- Source/Engine/Serialization/JsonConverters.cs | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/Source/Engine/Serialization/JsonConverters.cs b/Source/Engine/Serialization/JsonConverters.cs index 902593ac2..3130b597f 100644 --- a/Source/Engine/Serialization/JsonConverters.cs +++ b/Source/Engine/Serialization/JsonConverters.cs @@ -184,22 +184,31 @@ namespace FlaxEngine.Json case JsonToken.PropertyName: { var propertyName = (string)reader.Value; - var propertyValue = (float)reader.ReadAsDouble(); - switch (propertyName) + reader.Read(); + switch (reader.TokenType) { - case "Left": - value.Left = propertyValue; - break; - case "Right": - value.Right = propertyValue; - break; - case "Top": - value.Top = propertyValue; - break; - case "Bottom": - value.Bottom = propertyValue; + case JsonToken.Integer: + case JsonToken.Float: + { + var propertyValue = Convert.ToSingle(reader.Value); + switch (propertyName) + { + case "Left": + value.Left = propertyValue; + break; + case "Right": + value.Right = propertyValue; + break; + case "Top": + value.Top = propertyValue; + break; + case "Bottom": + value.Bottom = propertyValue; + break; + } break; } + } break; } case JsonToken.Comment: break;