Merge branch 'stabilization/2106' into tomhh_stabilization-to-development

This commit is contained in:
hultonha
2021-06-11 09:43:11 +01:00
306 changed files with 4155 additions and 1477 deletions
@@ -2664,6 +2664,18 @@ bool EditorViewportWidget::GetActiveCameraPosition(AZ::Vector3& cameraPos)
return false;
}
bool EditorViewportWidget::GetActiveCameraState(AzFramework::CameraState& cameraState)
{
if (m_pPrimaryViewport == this)
{
cameraState = GetCameraState();
return true;
}
return false;
}
void EditorViewportWidget::OnStartPlayInEditor()
{
if (m_viewEntityId.IsValid())