TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into MiscFixes2022049

Browse source
This commit is contained in:
JeffR 2022-04-10 18:54:33 -05:00
parent 5c8d8fab00 02864095ee
commit 50973b7f6f
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -219,6 +219,11 @@ StringTableEntry ImageAsset::getAssetIdByFilename(StringTableEntry fileName)
//acquire and bind the asset, and return it out
imageAssetId = query.mAssetList[0];
}
else
{
AssetPtr<ImageAsset> imageAsset = imageAssetId;
imageAsset->mLoadedState = AssetErrCode::BadFileReference;
}
return imageAssetId;
}

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

@ -473,6 +473,11 @@ StringTableEntry ShapeAsset::getAssetIdByFilename(StringTableEntry fileName)
//acquire and bind the asset, and return it out
shapeAssetId = query.mAssetList[0];
}
else
{
AssetPtr<ShapeAsset> shapeAsset = shapeAssetId;
shapeAsset->mLoadedState = AssetErrCode::BadFileReference;
}
return shapeAssetId;
}