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

Integrating github/staging through commit ab87ed9

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LmbrCentral/Code/Tests/SpawnerComponentTest.cpp
+4 -3
View File
@@ -369,7 +369,7 @@ TEST_F(SpawnerComponentTest, DestroySpawnedSlice_BeforeOnSpawnBegin_ContextFires
AzFramework::SliceInstantiationTicket ticket = m_spawnerComponent->SpawnSlice(m_sliceAssetRef);
m_spawnerComponent->DestroySpawnedSlice(ticket);
bool onSpawnedSliceDestroyed = TickUntil([this, ticket]() { return m_spawnWatcher->m_tickets[ticket].m_onSpawnedSliceDestroyed; });
TickUntil([this, ticket]() { return m_spawnWatcher->m_tickets[ticket].m_onSpawnedSliceDestroyed; });
bool onSliceInstantiationFailed = contextWatcher.m_onSliceInstantiationFailedTickets.count(ticket) > 0;
EXPECT_TRUE(onSliceInstantiationFailed);
@@ -646,7 +646,8 @@ public:
if (m_object)
{
if (m_editorSpawnerComponent = azrtti_cast<LmbrCentral::EditorSpawnerComponent*>(m_object->GetTemplate()))
m_editorSpawnerComponent = azrtti_cast<LmbrCentral::EditorSpawnerComponent*>(m_object->GetTemplate());
if (m_editorSpawnerComponent)
{
m_readConfigSuccess = m_editorSpawnerComponent->GetConfiguration(m_spawnerConfig);
}
@@ -694,4 +695,4 @@ TEST_F(LoadSpawnerComponentFromLegacyEditorData, DestroyOnDeactivate_ValuePreser
EXPECT_TRUE(m_spawnerConfig.m_destroyOnDeactivate);
}
#endif // LMBR_CENTRAL_EDITOR
#endif // LMBR_CENTRAL_EDITOR