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/ViewPane.cpp
+4 -4
View File
@@ -159,8 +159,8 @@ CLayoutViewPane::CLayoutViewPane(QWidget* parent)
, m_viewportTitleDlg(this)
, m_expanderWatcher(new ViewportTitleExpanderWatcher(this, &m_viewportTitleDlg))
{
m_viewport = 0;
m_active = 0;
m_viewport = nullptr;
m_active = false;
m_nBorder = VIEW_BORDER;
m_bFullscreen = false;
@@ -334,7 +334,7 @@ void CLayoutViewPane::DetachViewport()
{
DisconnectRenderViewportInteractionRequestBus();
OnFOVChanged(gSettings.viewports.fDefaultFov);
m_viewport = 0;
m_viewport = nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -344,7 +344,7 @@ void CLayoutViewPane::ReleaseViewport()
{
DisconnectRenderViewportInteractionRequestBus();
m_viewport->deleteLater();
m_viewport = 0;
m_viewport = nullptr;
}
}