From 0eed04904cbacfca6c9e35e7ab8b43b033463374 Mon Sep 17 00:00:00 2001 From: marynate Date: Wed, 2 Jul 2014 15:34:46 +0800 Subject: Forgot to add SceneTreeDock::set_selected change in last PR --- tools/editor/scene_tree_dock.cpp | 4 ++-- tools/editor/scene_tree_dock.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index c81374259e..c4c3a10f74 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -1038,9 +1038,9 @@ void SceneTreeDock::set_edited_scene(Node* p_scene) { edited_scene=p_scene; } -void SceneTreeDock::set_selected(Node *p_node) { +void SceneTreeDock::set_selected(Node *p_node, bool p_emit_selected ) { - scene_tree->set_selected(p_node,false); + scene_tree->set_selected(p_node,p_emit_selected); _update_tool_buttons(); } diff --git a/tools/editor/scene_tree_dock.h b/tools/editor/scene_tree_dock.h index 143c49f658..99ef16e6f6 100644 --- a/tools/editor/scene_tree_dock.h +++ b/tools/editor/scene_tree_dock.h @@ -127,7 +127,7 @@ public: void import_subscene(); void set_edited_scene(Node* p_scene); Node* instance(const String& p_path); - void set_selected(Node *p_node); + void set_selected(Node *p_node, bool p_emit_selected=false); void fill_path_renames(Node* p_node, Node *p_new_parent, List > *p_renames); void perform_node_renames(Node* p_base,List > *p_renames, Map, Set > *r_rem_anims=NULL); -- cgit v1.2.3