From e187762c2d9c73650a84f633aab83d447e725d3e Mon Sep 17 00:00:00 2001
From: Ignacio Etcheverry
Date: Fri, 15 Jan 2016 11:37:45 +0100
Subject: Spatial/Canvas Editor: Ignore unhandled input if there is a dialog

---
 tools/editor/plugins/canvas_item_editor_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/editor/plugins/canvas_item_editor_plugin.cpp')

diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp
index 56ed95fb1..2eaf017d0 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp
@@ -194,7 +194,7 @@ void CanvasItemEditor::_edit_set_pivot(const Vector2& mouse_pos) {
 
 void CanvasItemEditor::_unhandled_key_input(const InputEvent& p_ev) {
 
-	if (!is_visible())
+	if (!is_visible() || window_has_modal_stack())
 		return;
 	if (p_ev.key.mod.control)
 		// prevent to change tool mode when control key is pressed
-- 
cgit v1.3.1