diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-10-30 09:00:45 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-10-30 09:00:45 -0300 |
| commit | ab4126f51061277e87b41c48b40e7b54942d4eca (patch) | |
| tree | c58168b60323c4d43b58743b099e562a89e60a56 /tools/editor/scene_tree_dock.h | |
| parent | 8b15b26eedad4fdd33d50f5f9aa0fcc1875d503f (diff) | |
| parent | 914015f3b63dd956e72ea937d46ea4b2db005ada (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools/editor/scene_tree_dock.h')
| -rw-r--r-- | tools/editor/scene_tree_dock.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/editor/scene_tree_dock.h b/tools/editor/scene_tree_dock.h index 971013a568..36d4a6d208 100644 --- a/tools/editor/scene_tree_dock.h +++ b/tools/editor/scene_tree_dock.h @@ -58,7 +58,8 @@ class SceneTreeDock : public VBoxContainer { TOOL_REPLACE, TOOL_CONNECT, TOOL_GROUP, - TOOL_SCRIPT, + TOOL_CREATE_SCRIPT, + TOOL_LOAD_SCRIPT, TOOL_MOVE_UP, TOOL_MOVE_DOWN, TOOL_DUPLICATE, @@ -75,10 +76,12 @@ class SceneTreeDock : public VBoxContainer { int current_option; CreateDialog *create_dialog; + EditorFileDialog *file_dialog; ToolButton *button_add; ToolButton *button_instance; ToolButton *button_create_script; + ToolButton *button_load_script; SceneTreeEditor *scene_tree; @@ -147,13 +150,16 @@ class SceneTreeDock : public VBoxContainer { void _nodes_dragged(Array p_nodes,NodePath p_to,int p_type); void _files_dropped(Vector<String> p_files,NodePath p_to,int p_type); + void _script_dropped(String p_file, NodePath p_to); void _tree_rmb(const Vector2& p_menu_pos); void _filter_changed(const String& p_filter); void _perform_instance_scenes(const Vector<String>& p_files,Node* parent,int p_pos); + void _replace_with_branch_scene(const String& p_file,Node* base); + void _file_selected(String p_file); protected: void _notification(int p_what); @@ -173,7 +179,7 @@ public: 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); SceneTreeEditor *get_tree_editor() { return scene_tree; } - + EditorData *get_editor_data() { return editor_data; } void open_script_dialog(Node* p_for_node); SceneTreeDock(EditorNode *p_editor,Node *p_scene_root,EditorSelection *p_editor_selection,EditorData &p_editor_data); |