TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

variation on #387 that also introduces errorcodes

Browse source
This commit is contained in:
AzaezelX 2020-12-01 19:16:36 -06:00
parent 80eb4ab2ba
commit 220771d2fe
4 changed files with 123 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Engine/source/T3D/shapeBase.cpp
View file

@ -361,20 +361,15 @@ bool ShapeBaseData::preload(bool server, String &errorStr)
}
//Legacy catch
if (shapeAssetId == StringTable->EmptyString() && shapeName != StringTable->EmptyString())
if (shapeName != StringTable->EmptyString())
{
StringTableEntry assetId = ShapeAsset::getAssetIdByFilename(shapeName);
if (assetId != StringTable->EmptyString())
{
shapeAssetId = assetId;
}
shapeAssetId = ShapeAsset::getAssetIdByFilename(shapeName);
}
if (ShapeAsset::getAssetById(shapeAssetId, &shapeAsset))
U32 assetState = ShapeAsset::getAssetById(shapeAssetId, &shapeAsset);
if (AssetErrCode::Failed != assetState)
{
//Special exception case. If we've defaulted to the 'no shape' mesh, don't save it out, we'll retain the original ids/paths so it doesn't break
//the TSStatic
if (shapeAsset.getAssetId() != StringTable->insert("Core_Rendering:noshape"))
//only clear the legacy direct file reference if everything checks out fully
if (assetState == AssetErrCode::Ok)
{
shapeName = StringTable->EmptyString();
}