asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #566 from marynate/PR-fix-scene-tree-dock-set-selected

Browse source 
Forgot to add SceneTreeDock::set_selected change in last PR
This commit is contained in:
reduz 2014-07-02 10:19:45 -03:00
commit 9aa9c09168
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/editor/scene_tree_dock.cpp
View file

@ -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();
}

2
tools/editor/scene_tree_dock.h
View file

@ -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);