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

Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into carlito/stabilization/2106

Browse Source
This commit is contained in:
chcurran
2021-06-11 10:50:51 -07:00
parent 119bc95844 4818d1ce80
commit 168042dee4
350 changed files with 3811 additions and 1861 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
+4
View File
@@ -66,6 +66,7 @@ namespace ScriptCanvasEditor
SystemComponent::~SystemComponent()
{
AzToolsFramework::UnregisterViewPane(LyViewPane::ScriptCanvas);
AzToolsFramework::EditorContextMenuBus::Handler::BusDisconnect();
AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
AzToolsFramework::AssetSeedManagerRequests::Bus::Handler::BusDisconnect();
@@ -119,6 +120,7 @@ namespace ScriptCanvasEditor
void SystemComponent::Init()
{
AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
AzToolsFramework::EditorContextMenuBus::Handler::BusConnect();
}
void SystemComponent::Activate()
@@ -165,6 +167,8 @@ namespace ScriptCanvasEditor
options.canHaveMultipleInstances = false;
options.isPreview = true;
options.showInMenu = true;
options.showOnToolsToolbar = true;
options.toolbarIcon = ":/Menu/script_canvas_editor.svg";
AzToolsFramework::RegisterViewPane<ScriptCanvasEditor::MainWindow>(LyViewPane::ScriptCanvas, LyViewPane::CategoryTools, options);
}
Gems/ScriptCanvas/Code/Editor/SystemComponent.h
+7 -1
View File
@@ -22,6 +22,7 @@
#include <AzToolsFramework/API/ToolsApplicationAPI.h>
#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
#include <AzToolsFramework/Editor/EditorContextMenuBus.h>
#include <Editor/Assets/ScriptCanvasAssetTracker.h>
#include <AzToolsFramework/Asset/AssetSeedManager.h>
@@ -42,6 +43,7 @@ namespace ScriptCanvasEditor
, private AZ::Data::AssetBus::MultiHandler
, private AZ::Interface<IUpgradeRequests>::Registrar
, private AzToolsFramework::AssetSeedManagerRequests::Bus::Handler
, private AzToolsFramework::EditorContextMenuBus::Handler
{
public:
AZ_COMPONENT(SystemComponent, "{1DE7A120-4371-4009-82B5-8140CB1D7B31}");
@@ -71,8 +73,12 @@ namespace ScriptCanvasEditor
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// AztoolsFramework::EditorEvents::Bus::Handler...
// AztoolsFramework::EditorContextMenuBus::Handler...
void PopulateEditorGlobalContextMenu(QMenu* menu, const AZ::Vector2& point, int flags) override;
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// AztoolsFramework::EditorEvents::Bus::Handler...
void NotifyRegisterViews() override;
////////////////////////////////////////////////////////////////////////