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
@@ -301,7 +301,6 @@ namespace LyShine
{
UiCanvasFileObject* canvasFileObject = static_cast<UiCanvasFileObject*>(canvas);
AZ::Entity* oldRootSliceEntity = canvasFileObject->m_rootSliceEntity;
AZ::SliceComponent* oldSliceComponent = oldRootSliceEntity->FindComponent<AZ::SliceComponent>();
AZ::EntityId idToReuse = oldRootSliceEntity->GetId();
AZ::Entity* newRootSliceEntity = aznew AZ::Entity(idToReuse, AZStd::to_string(static_cast<AZ::u64>(idToReuse)).c_str());