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

Corrected handling for invalid shapes using fallback shape on TSStatics

Browse source
This commit is contained in:
JeffR 2026-05-31 16:22:12 -05:00
parent b338510921
commit d53892fb80
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/T3D/tsStatic.cpp
View file

@ -405,22 +405,23 @@ bool TSStatic::_createShape()
mAmbientThread = NULL; mAmbientThread = NULL;
//mShape = NULL; //mShape = NULL;
if (mShapeAssetRef.assetId == StringTable->EmptyString())
return false;
Resource<TSShape> shape; Resource<TSShape> shape;
if (!mShapeAssetRef.assetPtr.isValid()) if (mShapeAssetRef.assetPtr.isNull())
{
shape = ShapeAsset::smNoShapeAssetFallbackAssetPtr->getShapeResource(); shape = ShapeAsset::smNoShapeAssetFallbackAssetPtr->getShapeResource();
}
else else
{
shape = mShapeAssetRef.assetPtr->getShapeResource(); shape = mShapeAssetRef.assetPtr->getShapeResource();
if (shape)
{
if (isClientObject() && if (isClientObject() &&
!mShapeAssetRef.assetPtr->preloadMaterialList() && !mShapeAssetRef.assetPtr->preloadMaterialList() &&
NetConnection::filesWereDownloaded()) NetConnection::filesWereDownloaded())
return false; return false;
}
if (shape)
{
mObjBox = shape->mBounds; mObjBox = shape->mBounds;
resetWorldBox(); resetWorldBox();