Merge branch 'master' into Improve-HighlightedPopUpColor

Source/Engine/Content/Asset.cpp

@@ -487,6 +487,8 @@ bool Asset::WaitForLoaded(double timeoutInMilliseconds) const
     const auto loadingTask = (ContentLoadTask*)Platform::AtomicRead(&_loadingTask);
     if (loadingTask == nullptr)
     {
+        if (IsLoaded())
+            return false;
         LOG(Warning, "WaitForLoaded asset \'{0}\' failed. No loading task attached and asset is not loaded.", ToString());
         return true;
     }

Source/Engine/Serialization/JsonSerializer.cs

@@ -326,9 +326,10 @@ namespace FlaxEngine.Json
                 return customValueEquals.ValueEquals(objB);
 
             // If type contains SceneObject references then it needs to use custom comparision that handles prefab links (see SceneObjectEquals)
-            if (objA.GetType().IsStructure())
+            var typeA = objA.GetType();
+            if (typeA.IsValueType && !typeA.IsEnum && !typeA.IsPrimitive)
             {
-                var contract = Settings.ContractResolver.ResolveContract(objA.GetType());
+                var contract = Settings.ContractResolver.ResolveContract(typeA);
                 if (contract is JsonObjectContract objContract)
                 {
                     foreach (var property in objContract.Properties)