TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1123 from Azaezel/development

Browse source 
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
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/T3D/assets/ImageAsset.cpp
View file

@ -247,13 +247,10 @@ U32 ImageAsset::getAssetById(StringTableEntry assetId, AssetPtr<ImageAsset>* ima
{ {
if (imageAsset->isNull()) 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; return AssetErrCode::Failed;
} }
//handle noshape not being loaded itself //handle fallback not being loaded itself
if ((*imageAsset)->mLoadedState == BadFileReference) if ((*imageAsset)->mLoadedState == BadFileReference)
{ {
(*imageAsset)->loadImage(); (*imageAsset)->loadImage();