Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -669,7 +669,6 @@ AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
    StringOutcome BuilderSettingManager::LoadBuilderSettings()
    {
        StringOutcome outcome = STRING_OUTCOME_ERROR("");
-        AZ::IO::FileIOBase* ioInstance = AZ::IO::FileIOBase::GetInstance();
        // Construct the project setting path that is used by the tool for loading setting file
        const char* gameFolderPath = nullptr;
        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(gameFolderPath, &AzToolsFramework::AssetSystemRequestBus::Events::GetAbsoluteDevGameFolderPath);