TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #953 from Areloch/FixUseForDependenciesChecks

Browse source 
Fix up handling of assets marked for UseForDependencies during import process
This commit is contained in:
Brian Roberts 2023-02-02 00:31:38 -06:00 • committed by GitHub
commit 819eb97241
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1549,15 +1549,17 @@ void AssetImporter::processImportAssets(AssetImportObject* assetItem)
{ {
processShapeAnimationAsset(item); processShapeAnimationAsset(item);
} }
else else
{ {
String processCommand = "process"; String processCommand = "process";
processCommand += item->assetType; processCommand += item->assetType;
if (isMethod(processCommand.c_str())) if (isMethod(processCommand.c_str()))
Con::executef(this, processCommand.c_str(), item); Con::executef(this, processCommand.c_str(), item);
} }
item->importStatus = AssetImportObject::Processed; //If we've already set our status in the processing phase, don't override that new status
if(item->importStatus == AssetImportObject::NotProcessed)
item->importStatus = AssetImportObject::Processed;
//try recusing on the children(if any) //try recusing on the children(if any)
processImportAssets(item); processImportAssets(item);
@ -2419,6 +2421,12 @@ bool AssetImporter::checkAssetForCollision(AssetImportObject* assetItemToCheck,
void AssetImporter::resolveAssetItemIssues(AssetImportObject* assetItem) void AssetImporter::resolveAssetItemIssues(AssetImportObject* assetItem)
{ {
if(assetItem->importStatus == AssetImportObject::UseForDependencies)
{
//if we've already marked as only existing for dependency reasons, we'll just skip resolving any issues with it
importIssues = false;
return;
}
if (assetItem->statusType == String("DuplicateImportAsset") || assetItem->statusType == String("DuplicateAsset")) if (assetItem->statusType == String("DuplicateImportAsset") || assetItem->statusType == String("DuplicateAsset"))
{ {
String humanReadableReason = assetItem->statusType == String("DuplicateImportAsset") ? "Importing asset was duplicate of another importing asset" : "Importing asset was duplicate of an existing asset"; String humanReadableReason = assetItem->statusType == String("DuplicateImportAsset") ? "Importing asset was duplicate of another importing asset" : "Importing asset was duplicate of an existing asset";