diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-27 02:10:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-27 02:10:32 +0200 |
| commit | 5976e8d7ded314e56a2bb80406ea7eee9354e80c (patch) | |
| tree | dcd9fa0d9d1dd6f28533f055fd68078afaca41f7 /editor | |
| parent | e8345c824e361a3e6ca0e5dca384ad1856127bb7 (diff) | |
| parent | 1577f4165374fc7c6d7f3031e463f0aab6e96faa (diff) | |
Merge pull request #10625 from Rubonnek/fixed-leaks
Fixed several memory leaks
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_help.cpp | 1 | ||||
| -rw-r--r-- | editor/editor_node.cpp | 1 | ||||
| -rw-r--r-- | editor/editor_settings.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.h | 1 | ||||
| -rw-r--r-- | editor/script_create_dialog.cpp | 3 |
6 files changed, 11 insertions, 1 deletions
diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 29417709a3..17105606df 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -294,7 +294,6 @@ EditorHelpSearch::EditorHelpSearch() { VBoxContainer *vbc = memnew(VBoxContainer); add_child(vbc); - HBoxContainer *sb_hb = memnew(HBoxContainer); search_box = memnew(LineEdit); vbc->add_child(search_box); search_box->connect("text_changed", this, "_text_changed"); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 8cc1bb9b07..06e9860552 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -5484,6 +5484,7 @@ EditorNode::~EditorNode() { memdelete(editor_plugins_over); memdelete(editor_plugins_force_input_forwarding); memdelete(file_server); + memdelete(progress_hb); EditorSettings::destroy(); } diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 5b73d83691..fe41e83bcb 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -260,6 +260,7 @@ static void _create_script_templates(const String &p_path) { } } + memdelete(dir); memdelete(file); } @@ -286,6 +287,7 @@ void EditorSettings::create() { self_contained = true; extra_config->load(exe_path + "/_sc_"); } + memdelete(d); if (self_contained) { // editor is self contained diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 0dcabb1776..34c0a0595e 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -4102,3 +4102,7 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasIte label_desc->hide(); editor->get_gui_base()->add_child(label_desc); } + +CanvasItemEditorViewport::~CanvasItemEditorViewport() { + memdelete(preview); +} diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index 9b027fda60..0291660d42 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -512,6 +512,7 @@ public: virtual void drop_data(const Point2 &p_point, const Variant &p_data); CanvasItemEditorViewport(EditorNode *p_node, CanvasItemEditor *p_canvas); + ~CanvasItemEditorViewport(); }; #endif diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index 299538a2b3..b70c63c97c 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -591,6 +591,9 @@ ScriptCreateDialog::ScriptCreateDialog() { hb->add_child(vb); hb->add_child(empty_v->duplicate()); + memdelete(empty_h); + memdelete(empty_v); + add_child(hb); /* Language */ |