Merge pull request #5675 from aws-lumberyard-dev/amzn-tommy/gitflow_211116_o3de2

Merge stabilization/2110 as of c3dacb1 to development
This commit is contained in:
Tommy Walton
2021-11-17 11:26:41 -08:00
committed by GitHub
176 changed files with 1622 additions and 1784 deletions
@@ -84,9 +84,10 @@ namespace ScriptCanvasEditor
{
m_assetId = assetId;
EditorGraphRequests* editorGraphRequests = EditorGraphRequestBus::FindFirstHandler(m_scriptCanvasId);
editorGraphRequests->SetAssetId(m_assetId);
if (EditorGraphRequests* editorGraphRequests = EditorGraphRequestBus::FindFirstHandler(m_scriptCanvasId))
{
editorGraphRequests->SetAssetId(m_assetId);
}
}
const GraphCanvas::ViewId& CanvasWidget::GetViewId() const