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

# Conflicts: # .github/workflows/tests.yml # Source/Engine/Content/JsonAsset.cs
2023-05-07 19:46:29 +02:00
parent 3a3e8e2ad5 0a5d37fd9b
commit 5a66e90b56
31 changed files with 603 additions and 311 deletions
--- a/Source/Engine/Content/JsonAsset.cs
+++ b/Source/Engine/Content/JsonAsset.cs
@@ -35,6 +35,11 @@ namespace FlaxEngine
                return null;

            var dataTypeName = DataTypeName;
+            if (string.IsNullOrEmpty(dataTypeName))
+            {
+                Debug.LogError(string.Format("Missing typename of data in Json asset '{0}'.", Path), this);
+                return null;
+            }
            var assemblies = Utils.GetAssemblies();
            for (int i = 0; i < assemblies.Length; i++)
            {