birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5562 from aws-lumberyard-dev/nvsickle/StabToDevNov21

Browse Source 
Merge `stabilization/2110` as of `fac3d0b1bf` into `development`
This commit is contained in:
Nicholas Van Sickle
2021-11-11 15:04:18 -08:00
committed by GitHub
parent f861ab622e 8d5dd4e35f
commit 2c2c1d8137
192 changed files with 2090 additions and 1621 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
-8
View File
@@ -91,14 +91,6 @@ namespace ScriptCanvasTests
AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
AZ_Assert(fileIO, "SC unit tests require filehandling");
if (!fileIO->GetAlias("@engroot@"))
{
const char* engineRoot = nullptr;
AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
AZ_Assert(engineRoot, "null engine root");
fileIO->SetAlias("@engroot@", engineRoot);
}
s_setupSucceeded = fileIO->GetAlias("@engroot@") != nullptr;
AZ::TickBus::AllowFunctionQueuing(true);