From 284ad3e083b492060740a98e93e1a5095d4e549e Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sat, 8 Aug 2020 00:54:06 -0500 Subject: [PATCH] from @OTHGMars: AssetImporter type and path for material look-ups. (and fix for pbrconfig entry) --- Engine/source/T3D/assets/assetImporter.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Engine/source/T3D/assets/assetImporter.cpp b/Engine/source/T3D/assets/assetImporter.cpp index 1b1f8c2b1..2077de844 100644 --- a/Engine/source/T3D/assets/assetImporter.cpp +++ b/Engine/source/T3D/assets/assetImporter.cpp @@ -1345,7 +1345,7 @@ void AssetImporter::processMaterialAsset(AssetImportObject* assetItem) for (U32 i = 0; i < suffixCount; i++) { //First, try checking based on the material's assetName for our patternbase - String testPath = assetItem->filePath.getPath(); + String testPath = assetItem->filePath.getRootAndPath(); testPath += "/" + assetItem->cleanAssetName + StringUnit::getUnit(suffixList.c_str(), i, ",;"); String imagePath = AssetImporter::findImagePath(testPath); @@ -1355,7 +1355,7 @@ void AssetImporter::processMaterialAsset(AssetImportObject* assetItem) //got a match! AssetImportObject* newImageAssetObj = addImportingAsset("ImageAsset", imagePath, assetItem, ""); - newImageAssetObj->imageSuffixType = ImageAsset::getImageTypeNameFromType((ImageAsset::ImageTypes)i); + newImageAssetObj->imageSuffixType = ImageAsset::getImageTypeNameFromType((ImageAsset::ImageTypes)t); matchedImageTypes[t] = newImageAssetObj; break; @@ -1364,7 +1364,7 @@ void AssetImporter::processMaterialAsset(AssetImportObject* assetItem) { if(materialImageNoSuffix.isNotEmpty()) { - testPath = assetItem->filePath.getPath(); + testPath = assetItem->filePath.getRootAndPath(); testPath += "/" + materialImageNoSuffix + StringUnit::getUnit(suffixList.c_str(), i, ",;"); imagePath = AssetImporter::findImagePath(testPath); @@ -1374,7 +1374,7 @@ void AssetImporter::processMaterialAsset(AssetImportObject* assetItem) //got a match! AssetImportObject* newImageAssetObj = addImportingAsset("ImageAsset", imagePath, assetItem, ""); - newImageAssetObj->imageSuffixType = ImageAsset::getImageTypeNameFromType((ImageAsset::ImageTypes)i); + newImageAssetObj->imageSuffixType = ImageAsset::getImageTypeNameFromType((ImageAsset::ImageTypes)t); matchedImageTypes[t] = newImageAssetObj; break; @@ -2337,7 +2337,7 @@ Torque::Path AssetImporter::importMaterialAsset(AssetImportObject* assetItem) } else if (imageType == ImageAsset::ImageTypes::PBRConfig) { - mapFieldName = "PBRConfig"; + mapFieldName = "PBRConfigMap"; } else if (imageType == ImageAsset::ImageTypes::Metalness) {