Skip to content

Commit 8159c45

Browse files
committed
Merge pull request #109027 from timothyqiu/editor-node-variables
Remove unused member variables in EditorNode
2 parents ab01179 + b56b776 commit 8159c45

File tree

2 files changed

+0
-21
lines changed

2 files changed

+0
-21
lines changed

editor/editor_node.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2769,7 +2769,6 @@ void EditorNode::_edit_current(bool p_skip_foreign, bool p_skip_inspector_update
27692769
}
27702770

27712771
bool inspector_only = editor_history.is_current_inspector_only();
2772-
current = current_obj;
27732772

27742773
if (!current_obj) {
27752774
SceneTreeDock::get_singleton()->set_selected(nullptr);
@@ -8520,18 +8519,6 @@ EditorNode::EditorNode() {
85208519
file_export_lib->add_option(TTR("Apply MeshInstance Transforms"), Vector<String>(), false);
85218520
gui_base->add_child(file_export_lib);
85228521

8523-
file_script = memnew(EditorFileDialog);
8524-
file_script->set_title(TTR("Open & Run a Script"));
8525-
file_script->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
8526-
file_script->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
8527-
List<String> sexts;
8528-
ResourceLoader::get_recognized_extensions_for_type("Script", &sexts);
8529-
for (const String &E : sexts) {
8530-
file_script->add_filter("*." + E);
8531-
}
8532-
gui_base->add_child(file_script);
8533-
file_script->connect("file_selected", callable_mp(this, &EditorNode::_dialog_action));
8534-
85358522
file_pack_zip = memnew(EditorFileDialog);
85368523
file_pack_zip->connect("file_selected", callable_mp(this, &EditorNode::_dialog_action));
85378524
file_pack_zip->set_file_mode(EditorFileDialog::FILE_MODE_SAVE_FILE);
@@ -8733,7 +8720,6 @@ EditorNode::EditorNode() {
87338720
EditorTranslationParser::get_singleton()->add_parser(packed_scene_translation_parser_plugin, EditorTranslationParser::STANDARD);
87348721

87358722
_edit_current();
8736-
current = nullptr;
87378723
saving_resource = Ref<Resource>();
87388724

87398725
set_process(true);

editor/editor_node.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,6 @@ class EditorNode : public Node {
346346
PopupMenu *tool_menu = nullptr;
347347
PopupMenu *export_as_menu = nullptr;
348348
Button *export_button = nullptr;
349-
Button *search_button = nullptr;
350-
TextureProgressBar *audio_vu = nullptr;
351349

352350
Timer *screenshot_timer = nullptr;
353351

@@ -408,10 +406,8 @@ class EditorNode : public Node {
408406
EditorBuildProfileManager *build_profile_manager = nullptr;
409407
EditorFileDialog *file_templates = nullptr;
410408
EditorFileDialog *file_export_lib = nullptr;
411-
EditorFileDialog *file_script = nullptr;
412409
EditorFileDialog *file_android_build_source = nullptr;
413410
EditorFileDialog *file_pack_zip = nullptr;
414-
String current_path;
415411
MenuButton *update_spinner = nullptr;
416412

417413
EditorMainScreen *editor_main_screen = nullptr;
@@ -463,7 +459,6 @@ class EditorNode : public Node {
463459
int current_menu_option = 0;
464460

465461
SubViewport *scene_root = nullptr; // Root of the scene being edited.
466-
Object *current = nullptr;
467462

468463
Ref<Resource> saving_resource;
469464
HashSet<Ref<Resource>> saving_resources_in_path;
@@ -479,8 +474,6 @@ class EditorNode : public Node {
479474
SceneImportSettingsDialog *scene_import_settings = nullptr;
480475
AudioStreamImportSettingsDialog *audio_stream_import_settings = nullptr;
481476

482-
String import_reload_fn;
483-
484477
HashSet<String> textfile_extensions;
485478
HashSet<String> other_file_extensions;
486479
HashSet<FileDialog *> file_dialogs;

0 commit comments

Comments
 (0)