Merge pull request #1123 from Azaezel/development

imageasset entries can be blank
This commit is contained in:
Brian Roberts 2023-10-31 16:24:03 -05:00 committed by GitHub
commit edbb76155b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -247,13 +247,10 @@ U32 ImageAsset::getAssetById(StringTableEntry assetId, AssetPtr<ImageAsset>* ima
{
if (imageAsset->isNull())
{
(*imageAsset)->loadImage();
//Well that's bad, loading the fallback failed.
Con::warnf("ImageAsset::getAssetById - Finding of asset with id %s failed with no fallback asset", assetId);
return AssetErrCode::Failed;
}
//handle noshape not being loaded itself
//handle fallback not being loaded itself
if ((*imageAsset)->mLoadedState == BadFileReference)
{
(*imageAsset)->loadImage();