From eade131ad23ccf4079c9db8d33f179f9fcd77c93 Mon Sep 17 00:00:00 2001 From: JeffR Date: Fri, 5 Jun 2026 01:56:09 -0500 Subject: [PATCH] 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. --- Engine/source/T3D/tsStatic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/source/T3D/tsStatic.cpp b/Engine/source/T3D/tsStatic.cpp index dd2bd8dcf..ea5d30beb 100644 --- a/Engine/source/T3D/tsStatic.cpp +++ b/Engine/source/T3D/tsStatic.cpp @@ -484,7 +484,7 @@ void TSStatic::prepCollision() mLOSDetails.clear(); mConvexList->nukeList(); - Resource 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 shape = mShapeAssetRef.assetPtr->getShapeResource(); + TSShape* shape = mShapeInstance->getShape(); PhysicsCollision* colShape = NULL; if (mCollisionType == Bounds)