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

Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux

Browse Source
This commit is contained in:
chcurran
2021-10-28 10:51:40 -07:00
parent 658da08495 67f90a9b37
commit 1b9f6c385d
1233 changed files with 62254 additions and 14819 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h
+4 -4
View File
@@ -9,6 +9,7 @@
#include <AzCore/std/containers/unordered_map.h>
#include <AzCore/Serialization/SerializeContext.h>
#include <AzToolsFramework/UI/Notifications/ToastBus.h>
#include <ScriptCanvas/Core/Graph.h>
#include <ScriptCanvas/Bus/GraphBus.h>
#include <ScriptCanvas/Bus/NodeIdPair.h>
@@ -27,7 +28,6 @@
#include <GraphCanvas/Components/Nodes/Wrapper/WrapperNodeBus.h>
#include <GraphCanvas/Components/SceneBus.h>
#include <GraphCanvas/Components/Slots/Data/DataSlotBus.h>
#include <GraphCanvas/Components/ToastBus.h>
#include <GraphCanvas/Types/GraphCanvasGraphSerialization.h>
#include <GraphCanvas/Editor/GraphModelBus.h>
@@ -52,7 +52,7 @@ namespace ScriptCanvasEditor
, private GraphCanvas::GraphModelRequestBus::Handler
, private GraphCanvas::SceneNotificationBus::Handler
, private GraphItemCommandNotificationBus::Handler
, private GraphCanvas::ToastNotificationBus::MultiHandler
, private AzToolsFramework::ToastNotificationBus::MultiHandler
, private GeneralEditorNotificationBus::Handler
, private AZ::SystemTickBus::Handler
{
@@ -329,7 +329,7 @@ namespace ScriptCanvasEditor
protected:
void PostRestore(const UndoData& restoredData) override;
void UnregisterToast(const GraphCanvas::ToastId& toastId);
void UnregisterToast(const AzToolsFramework::ToastId& toastId);
Graph(const Graph&) = delete;
@@ -352,7 +352,7 @@ namespace ScriptCanvasEditor
void HandleQueuedUpdates();
bool IsNodeVersionConverting(const AZ::EntityId& graphCanvasNodeId) const;
AZStd::unordered_map< GraphCanvas::ToastId, AZ::EntityId > m_toastNodeIds;
AZStd::unordered_map< AzToolsFramework::ToastId, AZ::EntityId > m_toastNodeIds;
// Function Definition Node Extension
void HandleFunctionDefinitionExtension(ScriptCanvas::Node* node, GraphCanvas::SlotId graphCanvasSlotId, const GraphCanvas::NodeId& nodeId);