From 7af992970a542e4a2dada0eba1326cb1932d8c2b Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Wed, 26 Mar 2025 18:51:44 +0000 Subject: [PATCH] Update ImageAsset.cpp update getAssetIdByFilename to also check the imageFile of the asset This helps match filenames for assets created privately such as probe bakes and targets --- Engine/source/T3D/assets/ImageAsset.cpp | 33 ++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/Engine/source/T3D/assets/ImageAsset.cpp b/Engine/source/T3D/assets/ImageAsset.cpp index 0004145bd..27fa241f6 100644 --- a/Engine/source/T3D/assets/ImageAsset.cpp +++ b/Engine/source/T3D/assets/ImageAsset.cpp @@ -297,7 +297,38 @@ StringTableEntry ImageAsset::getAssetIdByFilename(StringTableEntry fileName) } else { - AssetPtr imageAsset = imageAssetId; //ensures the fallback is loaded + foundAssetcount = AssetDatabase.findAssetType(&query, "ImageAsset"); + if (foundAssetcount != 0) + { + // loop all image assets and see if we can find one + // using the same image file/named target. + for (auto imgAsset : query.mAssetList) + { + AssetPtr temp = imgAsset; + if (temp.notNull()) + { + if (temp->getImageFile() == fileName) + { + return imgAsset; + } + else + { + Torque::Path temp1 = temp->getImageFile(); + Torque::Path temp2 = fileName; + + if (temp1.getFileName() == temp2.getFileName()) + { + return imgAsset; + } + } + + } + } + } + else + { + AssetPtr imageAsset = imageAssetId; //ensures the fallback is loaded + } } return imageAssetId;