Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -70,7 +70,6 @@ void CDisplaySettings::LoadRegistry()

 void CDisplaySettings::SetObjectHideMask(int hideMask)
 {
-    int prevMask = m_objectHideMask;
    m_objectHideMask = hideMask;

    gSettings.objectHideMask = m_objectHideMask;
@@ -87,7 +86,6 @@ void CDisplaySettings::PostInitApply()
 //////////////////////////////////////////////////////////////////////////
 void CDisplaySettings::SetRenderFlags(int flags)
 {
-    int prev = m_renderFlags;
    m_renderFlags = flags;

    if (!GetIEditor()->Get3DEngine())