godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #45943 from KoBeWi/YEEEET

Browse Source 
Remove Merge From Scene
This commit is contained in:
Rémi Verschelde
2021-02-18 15:15:19 +01:00
committed by GitHub
parent 82033bf9b4 6b4faa355c
commit 72f74eb29e
6 changed files with 0 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
editor/editor_node.cpp
View File

@@ -2520,16 +2520,6 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
} break;
case FILE_IMPORT_SUBSCENE: {
if (!editor_data.get_edited_scene_root()) {
show_accept(TTR("This operation can't be done without a selected node."), TTR("OK"));
break;
}
scene_tree_dock->import_subscene();
} break;
case FILE_EXTERNAL_OPEN_SCENE: {
if (unsaved_cache && !p_confirmed) {
confirmation->get_ok_button()->set_text(TTR("Open"));