diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-19 19:32:51 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-19 19:32:51 +0100 |
commit | 4ca6a9809d54aafcb9887cec037ee1f3947fdf02 (patch) | |
tree | 52f3e5e5814217b1adbd7a2a369bf5d799482e86 /editor | |
parent | 8b923163686d3141addaab3931d8875beb4f91d8 (diff) | |
parent | c0083e431bb7bf66987f396cf9a62fa372d92fe9 (diff) |
Merge pull request #44596 from KoBeWi/🧹🧹🧹
Cleanup unused engine code v2
Diffstat (limited to 'editor')
-rw-r--r-- | editor/editor_data.cpp | 18 | ||||
-rw-r--r-- | editor/editor_data.h | 2 | ||||
-rw-r--r-- | editor/editor_node.cpp | 1 | ||||
-rw-r--r-- | editor/editor_plugin.cpp | 3 | ||||
-rw-r--r-- | editor/editor_plugin.h | 3 | ||||
-rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 6 | ||||
-rw-r--r-- | editor/plugins/script_editor_plugin.h | 3 |
7 files changed, 0 insertions, 36 deletions
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index 6e66962605..3059ce445c 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -122,12 +122,6 @@ int EditorSelectionHistory::get_history_pos() { return current_elem_idx; } -bool EditorSelectionHistory::is_history_obj_inspector_only(int p_obj) const { - ERR_FAIL_INDEX_V(p_obj, history.size(), false); - ERR_FAIL_INDEX_V(history[p_obj].level, history[p_obj].path.size(), false); - return history[p_obj].path[history[p_obj].level].inspector_only; -} - ObjectID EditorSelectionHistory::get_history_obj(int p_obj) const { ERR_FAIL_INDEX_V(p_obj, history.size(), ObjectID()); ERR_FAIL_INDEX_V(history[p_obj].level, history[p_obj].path.size(), ObjectID()); @@ -351,18 +345,6 @@ void EditorData::apply_changes_in_editors() { } } -void EditorData::save_editor_global_states() { - for (int i = 0; i < editor_plugins.size(); i++) { - editor_plugins[i]->save_global_state(); - } -} - -void EditorData::restore_editor_global_states() { - for (int i = 0; i < editor_plugins.size(); i++) { - editor_plugins[i]->restore_global_state(); - } -} - void EditorData::paste_object_params(Object *p_object) { ERR_FAIL_NULL(p_object); undo_redo_manager->create_action(TTR("Paste Params")); diff --git a/editor/editor_data.h b/editor/editor_data.h index bce9dd345d..6a89b3572c 100644 --- a/editor/editor_data.h +++ b/editor/editor_data.h @@ -80,7 +80,6 @@ public: // Gets an object from the history. The most recent object would be the object with p_obj = get_history_len() - 1. ObjectID get_history_obj(int p_obj) const; - bool is_history_obj_inspector_only(int p_obj) const; bool next(); bool previous(); @@ -177,7 +176,6 @@ public: Callable get_move_array_element_function(const StringName &p_class) const; void save_editor_global_states(); - void restore_editor_global_states(); void add_custom_type(const String &p_type, const String &p_inherits, const Ref<Script> &p_script, const Ref<Texture2D> &p_icon); Variant instantiate_custom_type(const String &p_type, const String &p_inherits); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 7beea04589..b0278030f9 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -7400,7 +7400,6 @@ EditorNode::EditorNode() { _update_recent_scenes(); - editor_data.restore_editor_global_states(); set_process_shortcut_input(true); load_errors = memnew(RichTextLabel); diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index d508638acd..7f02148dfc 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -712,9 +712,6 @@ bool EditorPlugin::get_remove_list(List<Node *> *p_list) { return false; } -void EditorPlugin::restore_global_state() {} -void EditorPlugin::save_global_state() {} - void EditorPlugin::add_undo_redo_inspector_hook_callback(Callable p_callable) { EditorNode::get_singleton()->get_editor_data().add_undo_redo_inspector_hook_callback(p_callable); } diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h index b79d2de035..a5a17acdf1 100644 --- a/editor/editor_plugin.h +++ b/editor/editor_plugin.h @@ -278,9 +278,6 @@ public: void make_bottom_panel_item_visible(Control *p_item); void hide_bottom_panel(); - virtual void restore_global_state(); - virtual void save_global_state(); - void add_translation_parser_plugin(const Ref<EditorTranslationParserPlugin> &p_parser); void remove_translation_parser_plugin(const Ref<EditorTranslationParserPlugin> &p_parser); diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 188abf1f5c..e515b46b1e 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -4007,12 +4007,6 @@ void ScriptEditorPlugin::apply_changes() { script_editor->apply_scripts(); } -void ScriptEditorPlugin::restore_global_state() { -} - -void ScriptEditorPlugin::save_global_state() { -} - void ScriptEditorPlugin::set_window_layout(Ref<ConfigFile> p_layout) { script_editor->set_window_layout(p_layout); } diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h index d4c80c416b..988d07621c 100644 --- a/editor/plugins/script_editor_plugin.h +++ b/editor/plugins/script_editor_plugin.h @@ -542,9 +542,6 @@ public: virtual void save_external_data() override; virtual void apply_changes() override; - virtual void restore_global_state() override; - virtual void save_global_state() override; - virtual void set_window_layout(Ref<ConfigFile> p_layout) override; virtual void get_window_layout(Ref<ConfigFile> p_layout) override; |