Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -257,7 +257,6 @@ bool EDITOR_COMMON_API ShowBatchFileDialog(Serialization::StringList* result, co
else
{
string gameFolder = Path::GetEditingGameDataFolder().c_str();
int modIndex = 0;
string gamePrefix = GetIEditor()->GetPrimaryCDFolder().toUtf8().data();
if (!gamePrefix.empty() && gamePrefix[gamePrefix.size() - 1] != '\\')
{
@@ -338,8 +337,6 @@ bool EDITOR_COMMON_API ShowBatchFileDialog(Serialization::StringList* result, co
max(0, center.y() - dialog.height() / 2));
}
int numFailed = 0;
int numSaved = 0;
std::vector<string> failedFiles;
if (dialog.exec() == QDialog::Accepted)
{