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/scene_tree_editor.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'tools/editor/scene_tree_editor.cpp') diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index 531fe83bc..ea7d76013 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -39,12 +39,8 @@ Node *SceneTreeEditor::get_scene_node() { ERR_FAIL_COND_V(!is_inside_tree(),NULL); - if (get_tree()->get_root()->get_child_count() && get_tree()->get_root()->get_child(0)->cast_to()) - return get_tree()->get_root()->get_child(0)->cast_to()->get_edited_scene(); - else - return get_tree()->get_root(); - return NULL; + return get_tree()->get_edited_scene_root(); } -- cgit v1.2.3-70-g09d2