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

Merge pull request #1759 from Areloch/TSStaticFallbackShapePtrFix
Some checks failed
Linux Build / Ubuntu Latest GCC (push) Has been cancelled
Details
MacOSX Build / MacOSX Latest Clang (push) Has been cancelled
Details
Windows Build / Windows Latest MSVC (push) Has been cancelled
Details

Browse source 
Adjusts the logic for collision and physics setup functions in TSStatic
This commit is contained in:
Brian Roberts 2026-06-05 08:03:56 -05:00 • committed by GitHub
commit 0c2aa5328c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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();
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)