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

Adjusts the logic for collision and physics setup functions in TSStatic because we utilize/allow for the fallback shape and so need to contend for if we have a shapeInstance but our shapeAsset ptr is invalid.

Browse source
This commit is contained in:
JeffR 2026-06-05 01:56:09 -05:00
parent 8adf692da5
commit eade131ad2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -484,7 +484,7 @@ void TSStatic::prepCollision()
mLOSDetails.clear(); mLOSDetails.clear();
mConvexList->nukeList(); mConvexList->nukeList();
Resource<TSShape> shape = mShapeAssetRef.assetPtr->getShapeResource(); TSShape* shape = mShapeInstance->getShape();
if (mCollisionType == CollisionMesh || mCollisionType == VisibleMesh) if (mCollisionType == CollisionMesh || mCollisionType == VisibleMesh)
{ {
@ -515,7 +515,7 @@ void TSStatic::_updatePhysics()
if (!PHYSICSMGR || mCollisionType == None) if (!PHYSICSMGR || mCollisionType == None)
return; return;
Resource<TSShape> shape = mShapeAssetRef.assetPtr->getShapeResource(); TSShape* shape = mShapeInstance->getShape();
PhysicsCollision* colShape = NULL; PhysicsCollision* colShape = NULL;
if (mCollisionType == Bounds) if (mCollisionType == Bounds)