mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-25 01:23:52 +00:00
try to load shapes during preload
it's half the point of the protocol
This commit is contained in:
parent
c138d838bb
commit
e8ccb3443a
18 changed files with 63 additions and 71 deletions
|
|
@ -127,14 +127,8 @@ bool afxModelData::preload(bool server, String &errorStr)
|
|||
if (server)
|
||||
return true;
|
||||
|
||||
if (mShapeAsset.notNull())
|
||||
if (getShape())
|
||||
{
|
||||
if (!getShape())
|
||||
{
|
||||
errorStr = String::ToString("afxModelData::load: Failed to load shape \"%s\"", _getShapeAssetId());
|
||||
return false;
|
||||
}
|
||||
|
||||
// just parse up the string and collect the remappings in txr_tag_remappings.
|
||||
if (remap_txr_tags != ST_NULLSTRING)
|
||||
{
|
||||
|
|
@ -167,7 +161,11 @@ bool afxModelData::preload(bool server, String &errorStr)
|
|||
delete pDummy;
|
||||
}
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
errorStr = String::ToString("afxModelData::load: Failed to load shape \"%s\"", _getShapeAssetId());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue