mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-06-12 00:13:58 +00:00
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.
This commit is contained in:
parent
8adf692da5
commit
eade131ad2
1 changed files with 2 additions and 2 deletions
|
|
@ -484,7 +484,7 @@ void TSStatic::prepCollision()
|
|||
mLOSDetails.clear();
|
||||
mConvexList->nukeList();
|
||||
|
||||
Resource<TSShape> shape = mShapeAssetRef.assetPtr->getShapeResource();
|
||||
TSShape* shape = mShapeInstance->getShape();
|
||||
|
||||
if (mCollisionType == CollisionMesh || mCollisionType == VisibleMesh)
|
||||
{
|
||||
|
|
@ -515,7 +515,7 @@ void TSStatic::_updatePhysics()
|
|||
if (!PHYSICSMGR || mCollisionType == None)
|
||||
return;
|
||||
|
||||
Resource<TSShape> shape = mShapeAssetRef.assetPtr->getShapeResource();
|
||||
TSShape* shape = mShapeInstance->getShape();
|
||||
|
||||
PhysicsCollision* colShape = NULL;
|
||||
if (mCollisionType == Bounds)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue