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

2023-07-24 23:21:03 +02:00
parent 32d9067710 543433440e
commit ce16debabd
17 changed files with 137 additions and 126 deletions
--- a/Source/Editor/CustomEditors/Editors/AssetRefEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/AssetRefEditor.cs
@@ -80,6 +80,8 @@ namespace FlaxEditor.CustomEditors.Editors
                        assetType = customType;
                    else if (!Content.Settings.GameSettings.OptionalPlatformSettings.Contains(assetReference.TypeName))
                        Debug.LogWarning(string.Format("Unknown asset type '{0}' to use for asset picker filter.", assetReference.TypeName));
+                    else
+                        assetType = ScriptType.Void;
                }
            }