diff options
| author | Juan Linietsky | 2016-05-27 14:18:40 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-05-27 14:19:11 -0300 |
| commit | 8be2fabbe5cd846bac5e5a38e55f3fb70e73f2da (patch) | |
| tree | a3e932282cdafdd13c4f02bdf21f72f9846adcbe /tools/editor/scene_tree_dock.cpp | |
| parent | eb7227a20b27e91c6e2adfb1ded738f2dd7e453b (diff) | |
| download | godot-8be2fabbe5cd846bac5e5a38e55f3fb70e73f2da.tar.gz godot-8be2fabbe5cd846bac5e5a38e55f3fb70e73f2da.tar.zst godot-8be2fabbe5cd846bac5e5a38e55f3fb70e73f2da.zip | |
Diffstat (limited to 'tools/editor/scene_tree_dock.cpp')
| -rw-r--r-- | tools/editor/scene_tree_dock.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index 517162b81..3e36a3036 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -542,6 +542,10 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { } } break; + case TOOL_MERGE_FROM_SCENE: { + + EditorNode::get_singleton()->merge_from_scene(); + } break; case TOOL_NEW_SCENE_FROM: { Node *scene = editor_data->get_edited_scene_root(); @@ -1696,6 +1700,7 @@ void SceneTreeDock::_tree_rmb(const Vector2& p_menu_pos) { if (selection.size()==1) { menu->add_separator(); + menu->add_item(TTR("Merge From Scene"),TOOL_MERGE_FROM_SCENE); menu->add_item(TTR("Save Branch as Scene"),TOOL_NEW_SCENE_FROM); } menu->add_separator(); |