From 62214567c1b0a7f3b8723b232fc499f0ccee2177 Mon Sep 17 00:00:00 2001
From: yuriy0 <yuriy.toporovskyy@apocalypse333.com>
Date: Wed, 4 Aug 2021 16:38:57 -0400
Subject: [PATCH] Handle non-default viewport context

Co-authored-by: Nicholas Van Sickle <NVShacker@gmail.com>
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
---
 Code/Editor/EditorViewportWidget.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
index 73b0483592..32b308ae9b 100644
--- a/Code/Editor/EditorViewportWidget.cpp
+++ b/Code/Editor/EditorViewportWidget.cpp
@@ -2382,7 +2382,10 @@ void EditorViewportWidget::SetDefaultCamera()
 //////////////////////////////////////////////////////////////////////////
 AZ::RPI::ViewPtr EditorViewportWidget::GetCurrentAtomView() const
 {
-    auto atomViewportRequests = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
+if (m_renderViewport && m_renderViewport->GetViewportContext())
+{
+    return m_viewportContext->GetDefaultView();
+}
     if (atomViewportRequests)
     {
         const AZ::Name contextName = atomViewportRequests->GetDefaultViewportContextName();