Revert "Merge remote-tracking branch 'origin/master' into SniperSprint"

This reverts commit 62653cf65d, reversing changes made to b81bb9eeea.
2016-03-02 16:58:24 +01:00
parent 4e68f9063b
commit a20ef0504a
195 changed files with 2303 additions and 6805 deletions
@@ -104,11 +104,6 @@ protected:
        if (!m_Enabled) {
            return false;
        }
-            
-        ImGuiIO& io = ImGui::GetIO();
-        if (io.WantCaptureMouse || io.WantCaptureKeyboard) {
-            return false;
-        }

        m_SpeedMultiplier += e.DeltaY * (0.1 * m_SpeedMultiplier);
        m_Config->Set("Editor.CameraSpeed", m_SpeedMultiplier);