TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1402 from Azaezel/alpha41/mumbledMat

Browse source 
prexisting material asset safety check
This commit is contained in:
Brian Roberts 2025-03-01 18:41:37 -06:00 committed by GitHub
parent 2f2cfb94d1 bc9ed3e10a
commit 09cf5a0425
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/T3D/assets/assetImporter.cpp
View file

@ -1726,6 +1726,13 @@ void AssetImporter::processMaterialAsset(AssetImportObject* assetItem)
if (activeImportConfig->UseExistingMaterials)
{
//So if the material already exists, we should just use that. So first, let's find out if it already exists
if (activeImportConfig->AlwaysAddMaterialSuffix)
{
StringTableEntry suffix = activeImportConfig->AddedMaterialSuffix.c_str();
char buf[1024];
dSprintf(buf, sizeof(buf), "%s%s", assetName, suffix);
assetName = buf;
}
//check to see if the definition for this already exists
StringTableEntry existingMatAsset = MaterialAsset::getAssetIdByMaterialName(StringTable->insert(assetName));