GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Flax.flaxproj
#	Source/Editor/Content/Items/AssetItem.cs
This commit is contained in:
Wojtek Figat
2023-06-13 15:41:07 +02:00
parent 534d2388f5 55971167c8
commit 8f7da81621
19 changed files with 175 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Editor/Content/Items/AssetItem.cs
View File

@@ -23,6 +23,11 @@ namespace FlaxEditor.Content
/// </summary>
public string TypeName { get; }
/// <summary>
/// Returns true if asset is now loaded.
/// </summary>
public bool IsLoaded => FlaxEngine.Content.GetAsset(ID)?.IsLoaded ?? false;
/// <summary>
/// Initializes a new instance of the <see cref="AssetItem"/> class.
/// </summary>
@@ -89,7 +94,19 @@ namespace FlaxEditor.Content
/// <returns>The asset object.</returns>
public Asset LoadAsync()
{
return FlaxEngine.Content.LoadAsync<BinaryAsset>(ID);
return FlaxEngine.Content.LoadAsync<Asset>(ID);
}
/// <summary>
/// Reloads the asset (if it's loaded).
/// </summary>
public void Reload()
{
var asset = FlaxEngine.Content.GetAsset(ID);
if (asset != null && asset.IsLoaded)
{
asset.Reload();
}
}
/// <summary>