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
@@ -988,9 +988,7 @@ namespace GraphCanvas
{
return;
}
AZ::SerializeContext* serializeContext = AZ::EntityUtils::GetApplicationSerializeContext();
AZStd::vector<char> buffer;
SerializeToBuffer(serializationTarget, buffer);
@@ -3940,7 +3938,6 @@ namespace GraphCanvas
AZ::Entity* entity = entityRef;
if (entity)
{
AZ::Entity::State state = entity->GetState();
if (entity->GetState() == AZ::Entity::State::Constructed)
{
entity->Init();
@@ -4216,7 +4213,6 @@ namespace GraphCanvas
bool ambiguousNode = false;
AZ::EntityId hoveredNode;
bool ambiguousConnection = false;
AZStd::vector< AZ::EntityId > ambiguousConnections;
for (const AZ::EntityId& currentEntity : intersectedEntities)