From eff2931b2ab4db9d47d822e5ef66dce941c90d98 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 25 Aug 2015 00:08:45 -0300 Subject: Multiple, simultaneous node editing spuport!! ..but will you be brave enough to try it? :) --- tools/editor/editor_node.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'tools/editor/editor_node.cpp') diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 597fb236f..113f7c830 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -1427,10 +1427,7 @@ void EditorNode::_edit_current() { resources_dock->add_resource(Ref(current_res)); //top_pallete->set_current_tab(1); - } - - - if (current_obj->is_type("Node")) { + } else if (current_obj->is_type("Node")) { Node * current_node = current_obj->cast_to(); ERR_FAIL_COND(!current_node); @@ -1445,6 +1442,12 @@ void EditorNode::_edit_current() { //top_pallete->set_current_tab(0); + } else { + + property_editor->edit( current_obj ); + //scene_tree_dock->set_selected(current_node); + //object_menu->get_popup()->clear(); + } /* Take care of PLUGIN EDITOR */ -- cgit v1.2.3-70-g09d2