Merge branch 'development' into Atom/guthadam/atomtools_updating_cmake_config

2021-09-08 17:16:54 -05:00
parent fc251ae175 30cafff04d
commit 6191788caf
63 changed files with 1635 additions and 305 deletions
@@ -73,6 +73,7 @@ namespace AtomToolsFramework

        return AZ::Transform::CreateIdentity();
    }
+
    void ModularCameraViewportContextImpl::SetCameraTransform(const AZ::Transform& transform)
    {
        if (auto viewportContext = RetrieveViewportContext(m_viewportId))
@@ -80,6 +81,7 @@ namespace AtomToolsFramework
            viewportContext->SetCameraTransform(transform);
        }
    }
+
    void ModularCameraViewportContextImpl::ConnectViewMatrixChangedHandler(AZ::RPI::ViewportContext::MatrixChangedEvent::Handler& handler)
    {
        if (auto viewportContext = RetrieveViewportContext(m_viewportId))