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/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.cpp
-2
View File
@@ -1121,8 +1121,6 @@ namespace GraphCanvas
QPointF globalConnectionPoint = ConversionUtils::AZToQPoint(globalConnectionVector);
GraphCanvasGraphicsView* view = viewHandler->AsGraphicsView();
QPointF anchorPoint(0.0f, 0.0f);
ToastConfiguration toastConfiguration(ToastType::Error, "Unable to connect to slot", m_validationResult.m_failureReason);
Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.cpp
-2
View File
@@ -317,8 +317,6 @@ namespace GraphCanvas
AZStd::vector< NodeId > elementsToSearch = groupedElements;
SceneRequests* requests = SceneRequestBus::FindFirstHandler(graphId);
while (!elementsToSearch.empty())
{
AZ::EntityId searchedElement = elementsToSearch.front();
Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.cpp
-1
View File
@@ -1982,7 +1982,6 @@ namespace GraphCanvas
border.setWidth(1);
painter->setPen(border);
qreal penWidth = border.width();
qreal halfPenWidth = border.width() * 0.5f;
qreal spacing = 3;
qreal initialSpacing = 0;
Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp
+1 -5
View File
@@ -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)
Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.cpp
+3 -3
View File
@@ -255,11 +255,11 @@ namespace GraphCanvas
if (m_displayedConnection.IsValid())
{
for (int i = static_cast<int>(m_connections.size()) - 1; i >= 0; ++i)
for (auto connectionIter = m_connections.begin(); connectionIter != m_connections.end(); ++connectionIter)
{
if (m_connections[i] == m_displayedConnection)
if (*connectionIter == m_displayedConnection)
{
m_connections.erase(m_connections.begin() + i);
m_connections.erase(connectionIter);
break;
}
}
Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.cpp
+1 -1
View File
@@ -142,7 +142,7 @@ namespace GraphCanvas
}
AZ::Data::AssetHandler::LoadResult TranslationAssetHandler::LoadAssetData(
const AZ::Data::Asset<AZ::Data::AssetData>& asset, AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
[[maybe_unused]] const AZ::Data::Asset<AZ::Data::AssetData>& asset, AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
const AZ::Data::AssetFilterCB&)
{
AZ::Data::AssetHandler::LoadResult result = AZ::Data::AssetHandler::LoadResult::LoadComplete;
Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h
-1
View File
@@ -46,7 +46,6 @@ namespace GraphCanvas
TranslationAsset(const AZ::Data::AssetId& assetId = AZ::Data::AssetId(), AZ::Data::AssetData::AssetStatus status = AZ::Data::AssetData::AssetStatus::NotLoaded);
TranslationAsset(const TranslationAsset& rhs) = default;
~TranslationAsset() = default;
static const char* GetDisplayName() { return "Graph Canvas Translation"; }