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
@@ -466,9 +466,6 @@ void CInfoBar::IdleUpdate()
    }

    {
-        int settings = GetIEditor()->GetDisplaySettings()->GetSettings();
-        bool noCollision = settings & SETTINGS_NOCOLLISION;
-
        bool bPhysics = GetIEditor()->GetGameEngine()->GetSimulationMode();
        if ((ui->m_physicsBtn->isChecked() && !bPhysics) ||
            (!ui->m_physicsBtn->isChecked() && bPhysics))