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/editor_sub_scene.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/editor_sub_scene.cpp')
| -rw-r--r-- | tools/editor/editor_sub_scene.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/editor/editor_sub_scene.cpp b/tools/editor/editor_sub_scene.cpp index 2a6eba255..d7d79e5cc 100644 --- a/tools/editor/editor_sub_scene.cpp +++ b/tools/editor/editor_sub_scene.cpp @@ -196,7 +196,11 @@ void EditorSubScene::_bind_methods() { EditorSubScene::EditorSubScene() { + scene=NULL; + set_title("Select Sub-Scene.."); + set_hide_on_ok(false); + VBoxContainer *vb = memnew( VBoxContainer ); add_child(vb); set_child_rect(vb); @@ -211,9 +215,11 @@ EditorSubScene::EditorSubScene() { hb->add_child(b); b->connect("pressed",this,"_path_browse"); vb->add_margin_child("Scene Path:",hb); + tree = memnew( Tree ); tree->set_v_size_flags(SIZE_EXPAND_FILL); - vb->add_margin_child("Import From Node:",tree)->set_v_size_flags(SIZE_EXPAND_FILL); + vb->add_margin_child("Import From Node:",tree,true); + tree->connect("item_activated",this,"_ok"); file_dialog = memnew( EditorFileDialog ); List<String> extensions; @@ -228,8 +234,4 @@ EditorSubScene::EditorSubScene() { add_child(file_dialog); file_dialog->connect("file_selected",this,"_path_selected"); - scene=NULL; - - set_hide_on_ok(false); - } |