diff options
| author | Juan Linietsky | 2015-12-14 10:25:19 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-12-14 10:25:19 -0300 |
| commit | 4713bcccf3de5f8e0f577f29a67f38bfb8a99b57 (patch) | |
| tree | fa79263ca3cd17786086f3c9a93f40270abb73a5 /tools/editor/scene_tree_editor.cpp | |
| parent | 83e0e97214a4fad635e5992bbbbd413642d76436 (diff) | |
| parent | c262becd7bb87fc17e5a4d3b737c13682855da1a (diff) | |
| download | godot-4713bcccf3de5f8e0f577f29a67f38bfb8a99b57.tar.gz godot-4713bcccf3de5f8e0f577f29a67f38bfb8a99b57.tar.zst godot-4713bcccf3de5f8e0f577f29a67f38bfb8a99b57.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools/editor/scene_tree_editor.cpp')
| -rw-r--r-- | tools/editor/scene_tree_editor.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index 657560307..a164703e3 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -928,7 +928,7 @@ void SceneTreeDialog::_cancel() { void SceneTreeDialog::_select() { if (tree->get_selected()) { - emit_signal("selected",tree->get_selected()->get_path()); + emit_signal("selected",tree->get_selected()->get_path()); hide(); } } @@ -939,7 +939,6 @@ void SceneTreeDialog::_bind_methods() { ObjectTypeDB::bind_method("_cancel",&SceneTreeDialog::_cancel); ADD_SIGNAL( MethodInfo("selected",PropertyInfo(Variant::NODE_PATH,"path"))); - } @@ -951,7 +950,7 @@ SceneTreeDialog::SceneTreeDialog() { add_child(tree); set_child_rect(tree); - + tree->get_scene_tree()->connect("item_activated",this,"_select"); } |