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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GraphModel/Code/Include/GraphModel/Integration/GraphController.h
+1 -1
View File
@@ -186,7 +186,7 @@ namespace GraphModelIntegration
/// Extendable slot handlers
void RemoveSlot(const GraphCanvas::Endpoint& endpoint) override;
bool IsSlotRemovable(const GraphCanvas::Endpoint& endpoint) const override;
GraphCanvas::SlotId RequestExtension(const GraphCanvas::NodeId& nodeId, const GraphCanvas::ExtenderId& extenderId) override;
GraphCanvas::SlotId RequestExtension(const GraphCanvas::NodeId& nodeId, const GraphCanvas::ExtenderId& extenderId, GraphModelRequests::ExtensionRequestReason) override;
bool ShouldWrapperAcceptDrop(const GraphCanvas::NodeId& wrapperNode, const QMimeData* mimeData) const override;
void AddWrapperDropTarget(const GraphCanvas::NodeId& wrapperNode) override;
Gems/GraphModel/Code/Source/Integration/GraphController.cpp
+1 -1
View File
@@ -1396,7 +1396,7 @@ namespace GraphModelIntegration
}
GraphCanvas::SlotId GraphController::RequestExtension(const GraphCanvas::NodeId& nodeId, const GraphCanvas::ExtenderId& extenderId)
GraphCanvas::SlotId GraphController::RequestExtension(const GraphCanvas::NodeId& nodeId, const GraphCanvas::ExtenderId& extenderId, GraphModelRequests::ExtensionRequestReason )
{
GraphCanvas::SlotId graphCanvasSlotId;
Gems/GraphModel/Code/Tests/MockGraphCanvas.cpp
+5
View File
@@ -108,6 +108,11 @@ namespace MockGraphCanvasServices
return false;
}
bool MockDataSlotComponent::IsUserSlot() const
{
return false;
}
bool MockDataSlotComponent::ConvertToValue()
{
return false;
Gems/GraphModel/Code/Tests/MockGraphCanvas.h
+2
View File
@@ -80,6 +80,8 @@ namespace MockGraphCanvasServices
bool CanConvertToReference() const override;
bool ConvertToValue() override;
bool CanConvertToValue() const override;
bool IsUserSlot() const override;
GraphCanvas::DataSlotType GetDataSlotType() const override;
GraphCanvas::DataValueType GetDataValueType() const override;
AZ::Uuid GetDataTypeId() const override;