mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2026-06-06 08:42:35 +00:00
Assets with a name starting with ',' will now be always loaded as a default dependency.
This commit is contained in:
@@ -155,6 +155,9 @@ XAssetInfoGeneric* AssetCreationContext::LoadDependencyGeneric(const asset_type_
|
|||||||
return LoadDefaultAssetDependency(assetType, std::format(",{}", assetName));
|
return LoadDefaultAssetDependency(assetType, std::format(",{}", assetName));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (assetName.starts_with(','))
|
||||||
|
return LoadDefaultAssetDependency(assetType, assetName);
|
||||||
|
|
||||||
const auto assetTypeName = m_game.GetAssetTypeName(assetType).value_or("unknown");
|
const auto assetTypeName = m_game.GetAssetTypeName(assetType).value_or("unknown");
|
||||||
|
|
||||||
if (m_ignored_asset_lookup->IsAssetIgnored(assetType, assetName))
|
if (m_ignored_asset_lookup->IsAssetIgnored(assetType, assetName))
|
||||||
@@ -172,10 +175,6 @@ XAssetInfoGeneric* AssetCreationContext::LoadDependencyGeneric(const asset_type_
|
|||||||
|
|
||||||
con::error(R"(Could not load asset "{}" of type "{}")", assetName, assetTypeName);
|
con::error(R"(Could not load asset "{}" of type "{}")", assetName, assetTypeName);
|
||||||
}
|
}
|
||||||
else if (assetName[0] == ',')
|
|
||||||
{
|
|
||||||
return LoadDefaultAssetDependency(assetType, assetName);
|
|
||||||
}
|
|
||||||
else if (required)
|
else if (required)
|
||||||
{
|
{
|
||||||
con::error(R"(Missing asset "{}" of type "{}")", assetName, assetTypeName);
|
con::error(R"(Missing asset "{}" of type "{}")", assetName, assetTypeName);
|
||||||
|
|||||||
Reference in New Issue
Block a user