diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-16 01:16:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-16 01:16:01 +0100 |
| commit | 2e21a427ee4a9d596f8b38d0a8e0f71c18dc9c37 (patch) | |
| tree | 53e19a3f3d2cc27032ab6ccb742fea79431c5fd7 /editor/editor_sub_scene.h | |
| parent | 3caa18f02a7cc35a39aa041ba8d57407692d1a64 (diff) | |
| parent | 2c7131e5acba610bf9121af14591ad71df287ee3 (diff) | |
Merge pull request #14609 from sersoong/master-test
Enhanced Merge From Scene
Diffstat (limited to 'editor/editor_sub_scene.h')
| -rw-r--r-- | editor/editor_sub_scene.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/editor/editor_sub_scene.h b/editor/editor_sub_scene.h index 13ce19bbb2..db9d91018a 100644 --- a/editor/editor_sub_scene.h +++ b/editor/editor_sub_scene.h @@ -38,13 +38,18 @@ class EditorSubScene : public ConfirmationDialog { GDCLASS(EditorSubScene, ConfirmationDialog); + List<Node *> selection; LineEdit *path; Tree *tree; Node *scene; + bool is_root; EditorFileDialog *file_dialog; void _fill_tree(Node *p_node, TreeItem *p_parent); + void _selected_changed(); + void _item_multi_selected(Object *p_object, int p_cell, bool p_selected); + void _remove_selection_child(Node *c); void _reown(Node *p_node, List<Node *> *p_to_reown); void ok_pressed(); |