فهرست منبع

preload materials for shapebasedatas and debris

AzaezelX 4 سال پیش
والد
کامیت
11a29ef97a
2فایلهای تغییر یافته به همراه5 افزوده شده و 0 حذف شده
  1. 2 0
      Engine/source/T3D/debris.cpp
  2. 3 0
      Engine/source/T3D/shapeBase.cpp

+ 2 - 0
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;
       }
    }
 

+ 3 - 0
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());