TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup mismerge lines

Browse source
This commit is contained in:
Areloch 2021-09-10 15:14:57 -05:00
parent dec9f54a9b
commit b9c071b9fd
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2433,8 +2433,6 @@ void AssetImporter::importAssets(AssetImportObject* assetItem)
if (!refreshSuccess) if (!refreshSuccess)
{ {
const char* importReturnVal = Con::executef(this, processCommand.c_str(), childItem).getString();
assetPath = Torque::Path(importReturnVal);
dSprintf(importLogBuffer, sizeof(importLogBuffer), "AssetImporter::importAssets - Failed to refresh reimporting asset %s.", item->assetName.c_str()); dSprintf(importLogBuffer, sizeof(importLogBuffer), "AssetImporter::importAssets - Failed to refresh reimporting asset %s.", item->assetName.c_str());
activityLog.push_back(importLogBuffer); activityLog.push_back(importLogBuffer);
} }