|
@@ -1821,10 +1821,8 @@ void AssetImporter::processShapeAsset(AssetImportObject* assetItem)
|
|
}
|
|
}
|
|
|
|
|
|
S32 meshCount = dAtoi(assetItem->shapeInfo->getDataField(StringTable->insert("_meshCount"), nullptr));
|
|
S32 meshCount = dAtoi(assetItem->shapeInfo->getDataField(StringTable->insert("_meshCount"), nullptr));
|
|
- S32 shapeItem = assetItem->shapeInfo->findItemByName("Meshes");
|
|
|
|
|
|
|
|
S32 animCount = dAtoi(assetItem->shapeInfo->getDataField(StringTable->insert("_animCount"), nullptr));
|
|
S32 animCount = dAtoi(assetItem->shapeInfo->getDataField(StringTable->insert("_animCount"), nullptr));
|
|
- S32 animItem = assetItem->shapeInfo->findItemByName("Animations");
|
|
|
|
|
|
|
|
S32 materialCount = dAtoi(assetItem->shapeInfo->getDataField(StringTable->insert("_materialCount"), nullptr));
|
|
S32 materialCount = dAtoi(assetItem->shapeInfo->getDataField(StringTable->insert("_materialCount"), nullptr));
|
|
S32 matItem = assetItem->shapeInfo->findItemByName("Materials");
|
|
S32 matItem = assetItem->shapeInfo->findItemByName("Materials");
|
|
@@ -2005,9 +2003,7 @@ void AssetImporter::validateAsset(AssetImportObject* assetItem)
|
|
if (assetItem->importStatus == AssetImportObject::Skipped || assetItem->importStatus == AssetImportObject::NotProcessed)
|
|
if (assetItem->importStatus == AssetImportObject::Skipped || assetItem->importStatus == AssetImportObject::NotProcessed)
|
|
return;
|
|
return;
|
|
|
|
|
|
- bool hasCollision = checkAssetForCollision(assetItem);
|
|
|
|
-
|
|
|
|
- if (hasCollision)
|
|
|
|
|
|
+ if (checkAssetForCollision(assetItem))
|
|
{
|
|
{
|
|
importIssues = true;
|
|
importIssues = true;
|
|
return;
|
|
return;
|
|
@@ -2018,7 +2014,6 @@ void AssetImporter::validateAsset(AssetImportObject* assetItem)
|
|
AssetQuery aQuery;
|
|
AssetQuery aQuery;
|
|
U32 numAssetsFound = AssetDatabase.findAllAssets(&aQuery);
|
|
U32 numAssetsFound = AssetDatabase.findAllAssets(&aQuery);
|
|
|
|
|
|
- bool hasCollision = false;
|
|
|
|
for (U32 i = 0; i < numAssetsFound; i++)
|
|
for (U32 i = 0; i < numAssetsFound; i++)
|
|
{
|
|
{
|
|
StringTableEntry assetId = aQuery.mAssetList[i];
|
|
StringTableEntry assetId = aQuery.mAssetList[i];
|
|
@@ -2032,7 +2027,6 @@ void AssetImporter::validateAsset(AssetImportObject* assetItem)
|
|
|
|
|
|
if (assetName == StringTable->insert(assetItem->assetName.c_str()))
|
|
if (assetName == StringTable->insert(assetItem->assetName.c_str()))
|
|
{
|
|
{
|
|
- hasCollision = true;
|
|
|
|
assetItem->status = "Error";
|
|
assetItem->status = "Error";
|
|
assetItem->statusType = "DuplicateAsset";
|
|
assetItem->statusType = "DuplicateAsset";
|
|
assetItem->statusInfo = "Duplicate asset names found within the target module!\nAsset \"" + assetItem->assetName + "\" of type \"" + assetItem->assetType + "\" has a matching name.\nPlease rename it and try again!";
|
|
assetItem->statusInfo = "Duplicate asset names found within the target module!\nAsset \"" + assetItem->assetName + "\" of type \"" + assetItem->assetType + "\" has a matching name.\nPlease rename it and try again!";
|
|
@@ -2241,7 +2235,6 @@ void AssetImporter::resetImportConfig()
|
|
activeImportConfig->registerObject();
|
|
activeImportConfig->registerObject();
|
|
}
|
|
}
|
|
|
|
|
|
- bool foundConfig = false;
|
|
|
|
Settings* editorSettings;
|
|
Settings* editorSettings;
|
|
//See if we can get our editor settings
|
|
//See if we can get our editor settings
|
|
if (Sim::findObject("EditorSettings", editorSettings))
|
|
if (Sim::findObject("EditorSettings", editorSettings))
|