Merge branch 'master' into Respawning

2016-03-01 17:34:23 +01:00
parent 3d4427dd20 c60e1ba7e4
commit a9762f44ca
37 changed files with 588 additions and 271 deletions
@@ -580,6 +580,11 @@ void EditorGUI::createWidgetToolButton(WidgetMode mode)

 bool EditorGUI::OnKeyDown(const Events::KeyDown& e)
 {
+    ImGuiIO& io = ImGui::GetIO();
+    if (io.WantCaptureKeyboard) {
+        return false;
+    }
+
    if (e.ModCtrl && e.KeyCode == GLFW_KEY_S) {
        if (m_CurrentSelection.Valid()) {
            EntityWrapper baseParent = m_CurrentSelection;