From d53892fb803c6502b03bcc67ea90f46d7884fe4e Mon Sep 17 00:00:00 2001
From: JeffR <Areloch@gmail.com>
Date: Sun, 31 May 2026 16:22:12 -0500
Subject: [PATCH] Corrected handling for invalid shapes using fallback shape on
 TSStatics

---
 Engine/source/T3D/tsStatic.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Engine/source/T3D/tsStatic.cpp b/Engine/source/T3D/tsStatic.cpp
index 2c4b7fc14..dd2bd8dcf 100644
--- a/Engine/source/T3D/tsStatic.cpp
+++ b/Engine/source/T3D/tsStatic.cpp
@@ -405,22 +405,23 @@ bool TSStatic::_createShape()
    mAmbientThread = NULL;
    //mShape = NULL;
 
-   if (mShapeAssetRef.assetId == StringTable->EmptyString())
-      return false;
-
    Resource<TSShape> shape;
-   if (!mShapeAssetRef.assetPtr.isValid())
+   if (mShapeAssetRef.assetPtr.isNull())
+   {
       shape = ShapeAsset::smNoShapeAssetFallbackAssetPtr->getShapeResource();
+   }
    else
+   {
       shape = mShapeAssetRef.assetPtr->getShapeResource();
 
-   if (shape)
-   {
       if (isClientObject() &&
          !mShapeAssetRef.assetPtr->preloadMaterialList() &&
          NetConnection::filesWereDownloaded())
          return false;
+   }
 
+   if (shape)
+   {
       mObjBox = shape->mBounds;
       resetWorldBox();