Integrating latest 47acbe8

Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp

@@ -13,18 +13,19 @@
 #include "precompiled.h"
 
 #include "CanvasWidget.h"
-// qpainter.h(465): warning C4251: 'QPainter::d_ptr': class 'QScopedPointer<QPainterPrivate,QScopedPointerDeleter<T>>' needs to have dll-interface to be used by clients of class 'QPainter'
-// qpainter.h(450): warning C4800: 'QFlags<QPainter::RenderHint>::Int': forcing value to bool 'true' or 'false' (performance warning)
-AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option")
+
+AZ_PUSH_DISABLE_WARNING(4244 4251 4800, "-Wunknown-warning-option")
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QGraphicsView>
 #include <QPushButton>
+
+#include "Editor/View/Widgets/ui_CanvasWidget.h"
 AZ_POP_DISABLE_WARNING
 
 #include <AzCore/Casting/numeric_cast.h>
 
-#include "Editor/View/Widgets/ui_CanvasWidget.h"
+
 
 #include <GraphCanvas/Widgets/GraphCanvasGraphicsView/GraphCanvasGraphicsView.h>
 #include <GraphCanvas/Widgets/MiniMapGraphicsView/MiniMapGraphicsView.h>
@@ -32,7 +33,7 @@ AZ_POP_DISABLE_WARNING
 
 #include <Debugger/Bus.h>
 #include <Core/Graph.h>
-#include <Editor/View/Dialogs/Settings.h>
+#include <Editor/View/Dialogs/SettingsDialog.h>
 #include <Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h>
 #include <Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h>
 
@@ -84,6 +85,15 @@ namespace ScriptCanvasEditor
             m_scriptCanvasId = scriptCanvasId;
         }
 
+        void CanvasWidget::SetAssetId(const AZ::Data::AssetId& assetId)
+        {
+            m_assetId = assetId;
+
+            EditorGraphRequests* editorGraphRequests = EditorGraphRequestBus::FindFirstHandler(m_scriptCanvasId);
+
+            editorGraphRequests->SetAssetId(m_assetId);
+        }
+
         const GraphCanvas::ViewId& CanvasWidget::GetViewId() const
         {
             return m_graphicsView->GetViewId();