birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements

Browse Source 
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
This commit is contained in:
Yuriy Toporovskyy
2021-08-06 10:32:38 -04:00
parent 6e59b1f519 053c4af66d
commit fd616fdcfb
425 changed files with 2145 additions and 1758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/ViewManager.cpp
+6 -6
View File
@@ -52,7 +52,7 @@ CViewManager::CViewManager()
m_updateRegion.min = Vec3(-100000, -100000, -100000);
m_updateRegion.max = Vec3(100000, 100000, 100000);
m_pSelectedView = NULL;
m_pSelectedView = nullptr;
m_nGameViewports = 0;
m_bGameViewportsUpdated = false;
@@ -107,7 +107,7 @@ void CViewManager::UnregisterViewport(CViewport* pViewport)
{
if (m_pSelectedView == pViewport)
{
m_pSelectedView = NULL;
m_pSelectedView = nullptr;
}
stl::find_and_erase(m_viewports, pViewport);
m_bGameViewportsUpdated = false;
@@ -127,7 +127,7 @@ CViewport* CViewManager::GetViewport(EViewportType type) const
return m_viewports[i];
}
}
return 0;
return nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -140,7 +140,7 @@ CViewport* CViewManager::GetViewport(const QString& name) const
return m_viewports[i];
}
}
return 0;
return nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -224,7 +224,7 @@ void CViewManager::SelectViewport(CViewport* pViewport)
{
// Audio: Handle viewport change for listeners
if (m_pSelectedView != NULL && m_pSelectedView != pViewport)
if (m_pSelectedView != nullptr && m_pSelectedView != pViewport)
{
m_pSelectedView->SetSelected(false);
@@ -232,7 +232,7 @@ void CViewManager::SelectViewport(CViewport* pViewport)
m_pSelectedView = pViewport;
if (m_pSelectedView != NULL)
if (m_pSelectedView != nullptr)
{
m_pSelectedView->SetSelected(true);
}