Forgot to add SceneTreeDock::set_selected change in last PR

marynate · marynate · commit 0eed04904cba · 2014-07-02T15:34:46.000+08:00
diff --git 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
@@ -127,7 +127,7 @@ class SceneTreeDock : public VBoxContainer {
 	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);
 

Original file line number	Diff line number	Diff line change
`@@ -1038,9 +1038,9 @@ void SceneTreeDock::set_edited_scene(Node* p_scene) {`
`1038`	`1038`	`edited_scene=p_scene;`
`1039`	`1039`	`}`
`1040`	`1040`
`1041`		`-void SceneTreeDock::set_selected(Node *p_node) {`
	`1041`	`+void SceneTreeDock::set_selected(Node *p_node, bool p_emit_selected ) {`
`1042`	`1042`
`1043`		`- scene_tree->set_selected(p_node,false);`
	`1043`	`+ scene_tree->set_selected(p_node,p_emit_selected);`
`1044`	`1044`	`_update_tool_buttons();`
`1045`	`1045`	`}`
`1046`	`1046`