From c0b4523b7b97956f6246dba5c30bebc164327d26 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Mon, 29 Nov 2021 19:59:21 +0100
Subject: [PATCH] Fix editor undo for unsigned integer types

---
 Source/Editor/Utilities/MemberComparison.cs | 33 ++++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/Source/Editor/Utilities/MemberComparison.cs b/Source/Editor/Utilities/MemberComparison.cs
index eed089d1d..d8441b67c 100644
--- a/Source/Editor/Utilities/MemberComparison.cs
+++ b/Source/Editor/Utilities/MemberComparison.cs
@@ -64,20 +64,31 @@ namespace FlaxEditor.Utilities
             var finalMember = MemberPath.GetLastMember(ref instance);
 
             var type = finalMember.Type;
-            if (value != null && type != ScriptType.Null)
+            if (value != null && type != ScriptType.Null && type != value.GetType())
             {
+                // Convert value to ensure it matches the member type (eg. undo that uses json serializer might return different value type for some cases)
                 if (type.IsEnum)
-                {
                     value = Convert.ChangeType(value, Enum.GetUnderlyingType(type.Type));
-                }
-                else if (value is long && type.Type == typeof(int))
-                {
-                    value = (int)(long)value;
-                }
-                else if (value is double && type.Type == typeof(float))
-                {
-                    value = (float)(double)value;
-                }
+                else if (type.Type == typeof(byte))
+                    value = Convert.ToByte(value);
+                else if (type.Type == typeof(sbyte))
+                    value = Convert.ToSByte(value);
+                else if (type.Type == typeof(short))
+                    value = Convert.ToInt16(value);
+                else if (type.Type == typeof(int))
+                    value = Convert.ToInt32(value);
+                else if (type.Type == typeof(long))
+                    value = Convert.ToInt64(value);
+                else if (type.Type == typeof(int))
+                    value = Convert.ToUInt16(value);
+                else if (type.Type == typeof(uint))
+                    value = Convert.ToUInt32(value);
+                else if (type.Type == typeof(ulong))
+                    value = Convert.ToUInt64(value);
+                else if (type.Type == typeof(float))
+                    value = Convert.ToSingle(value);
+                else if (type.Type == typeof(double))
+                    value = Convert.ToDouble(value);
             }
 
             finalMember.SetValue(instance, value);