Ver código fonte

Merge pull request #1123 from Azaezel/development

imageasset entries can be blank
Brian Roberts 1 ano atrás
pai
commit
edbb76155b
1 arquivos alterados com 1 adições e 4 exclusões
  1. 1 4
      Engine/source/T3D/assets/ImageAsset.cpp

+ 1 - 4
Engine/source/T3D/assets/ImageAsset.cpp

@@ -247,13 +247,10 @@ U32 ImageAsset::getAssetById(StringTableEntry assetId, AssetPtr<ImageAsset>* ima
    {
       if (imageAsset->isNull())
       {
-         (*imageAsset)->loadImage();
-         //Well that's bad, loading the fallback failed.
-         Con::warnf("ImageAsset::getAssetById - Finding of asset with id %s failed with no fallback asset", assetId);
          return AssetErrCode::Failed;
       }
 
-      //handle noshape not being loaded itself
+      //handle fallback not being loaded itself
       if ((*imageAsset)->mLoadedState == BadFileReference)
       {
          (*imageAsset)->loadImage();