From 72fcb8a35beab251d01864bc67da3e3a8e75aed6 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Sat, 16 Jan 2016 22:41:10 -0300
Subject: -Moved all the "root" input handling for GUI from individual Controls
 to Viewport. -Should fix several reported bugs when controls don't have a
 common parent

This may have added new bugs, so please report if so!
---
 tools/editor/editor_node.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools/editor/editor_node.cpp')

diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index d664a91c4..b933e2148 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -4964,8 +4964,9 @@ EditorNode::EditorNode() {
 
 
 	//scene_root_base->add_child(scene_root);
-	scene_root->set_meta("_editor_disable_input",true);
+	//scene_root->set_meta("_editor_disable_input",true);
 	VisualServer::get_singleton()->viewport_set_hide_scenario(scene_root->get_viewport(),true);
+	scene_root->set_disable_input(true);
 	scene_root->set_as_audio_listener_2d(true);
 	scene_root->set_size_override(true,Size2(Globals::get_singleton()->get("display/width"),Globals::get_singleton()->get("display/height")));
 
-- 
cgit v1.2.3-70-g09d2