diff options
| author | reduz <reduzio@gmail.com> | 2014-07-02 10:19:45 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2014-07-02 10:19:45 -0300 |
| commit | 9aa9c09168c18102392a4e0ffc2ef4f3734244b6 (patch) | |
| tree | 102e2edf85cad73aece54ef6f0644a1ee63257b6 | |
| parent | ecea1f34d34885d3151f978599c89d237ee908cc (diff) | |
| parent | 0eed04904cbacfca6c9e35e7ab8b43b033463374 (diff) | |
Merge pull request #566 from marynate/PR-fix-scene-tree-dock-set-selected
Forgot to add SceneTreeDock::set_selected change in last PR
| -rw-r--r-- | tools/editor/scene_tree_dock.cpp | 4 | ||||
| -rw-r--r-- | 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<Pair<NodePath,NodePath> > *p_renames); void perform_node_renames(Node* p_base,List<Pair<NodePath,NodePath> > *p_renames, Map<Ref<Animation>, Set<int> > *r_rem_anims=NULL); |