Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
This commit is contained in:
@@ -191,7 +191,7 @@ QtViewport::QtViewport(QWidget* parent)
|
||||
}
|
||||
m_screenTM.SetIdentity();
|
||||
|
||||
m_pMouseOverObject = 0;
|
||||
m_pMouseOverObject = nullptr;
|
||||
|
||||
m_bAdvancedSelectMode = false;
|
||||
|
||||
@@ -397,7 +397,7 @@ void QtViewport::OnDeactivate()
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void QtViewport::ResetContent()
|
||||
{
|
||||
m_pMouseOverObject = 0;
|
||||
m_pMouseOverObject = nullptr;
|
||||
|
||||
// Need to clear visual object cache.
|
||||
// Right after loading new level, some code(e.g. OnMouseMove) access invalid
|
||||
|
||||
Reference in New Issue
Block a user