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

preload materials for shapebasedatas and debris

Browse source
This commit is contained in:
AzaezelX 2021-08-09 16:14:10 -05:00
parent e7403197c7
commit 11a29ef97a
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/debris.cpp
View file

@ -285,6 +285,8 @@ bool DebrisData::preload(bool server, String &errorStr)
{ {
TSShapeInstance* pDummy = new TSShapeInstance(mShape, !server); TSShapeInstance* pDummy = new TSShapeInstance(mShape, !server);
delete pDummy; delete pDummy;
if (!server && !mShape->preloadMaterialList(mShape.getPath()) && NetConnection::filesWereDownloaded())
return false;
} }
} }

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

@ -347,6 +347,9 @@ bool ShapeBaseData::preload(bool server, String &errorStr)
S32 i; S32 i;
if (ShapeAsset::getAssetErrCode(mShapeAsset) != ShapeAsset::Failed && ShapeAsset::getAssetErrCode(mShapeAsset) != ShapeAsset::BadFileReference) if (ShapeAsset::getAssetErrCode(mShapeAsset) != ShapeAsset::Failed && ShapeAsset::getAssetErrCode(mShapeAsset) != ShapeAsset::BadFileReference)
{ {
if (!server && !mShape->preloadMaterialList(mShape.getPath()) && NetConnection::filesWereDownloaded())
shapeError = true;
if(computeCRC) if(computeCRC)
{ {
Con::printf("Validation required for shape asset: %s", mShapeAsset.getAssetId()); Con::printf("Validation required for shape asset: %s", mShapeAsset.getAssetId());