From 11a29ef97a6dc12156369212197541a6e55165ea Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Mon, 9 Aug 2021 16:14:10 -0500
Subject: [PATCH] preload materials for shapebasedatas and debris

---
 Engine/source/T3D/debris.cpp    | 2 ++
 Engine/source/T3D/shapeBase.cpp | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Engine/source/T3D/debris.cpp b/Engine/source/T3D/debris.cpp
index 1b5209e4a..2362fd089 100644
--- a/Engine/source/T3D/debris.cpp
+++ b/Engine/source/T3D/debris.cpp
@@ -285,6 +285,8 @@ bool DebrisData::preload(bool server, String &errorStr)
       {
          TSShapeInstance* pDummy = new TSShapeInstance(mShape, !server);
          delete pDummy;
+         if (!server && !mShape->preloadMaterialList(mShape.getPath()) && NetConnection::filesWereDownloaded())
+            return false;
       }
    }
 
diff --git a/Engine/source/T3D/shapeBase.cpp b/Engine/source/T3D/shapeBase.cpp
index 03b13f611..c1a814f07 100644
--- a/Engine/source/T3D/shapeBase.cpp
+++ b/Engine/source/T3D/shapeBase.cpp
@@ -347,6 +347,9 @@ bool ShapeBaseData::preload(bool server, String &errorStr)
    S32 i;
    if (ShapeAsset::getAssetErrCode(mShapeAsset) != ShapeAsset::Failed && ShapeAsset::getAssetErrCode(mShapeAsset) != ShapeAsset::BadFileReference)
    {
+      if (!server && !mShape->preloadMaterialList(mShape.getPath()) && NetConnection::filesWereDownloaded())
+         shapeError = true;
+
       if(computeCRC)
       {
          Con::printf("Validation required for shape asset: %s", mShapeAsset.getAssetId());