diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-27 11:17:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 11:17:12 +0100 |
| commit | 9a37d423c2c86a73be48b535a1e022c983ec8cf3 (patch) | |
| tree | ece159680b7d7a1740c2272dfbc57e4dd49b1223 | |
| parent | 75c7e66c5ed66e3832b2c94a8b809ab97b85922a (diff) | |
| parent | 762f241e104ba2726746e5322f9a6276c5d5de55 (diff) | |
Merge pull request #17072 from Noshyaar/leak
TileSetEditorPlgn: Fix a leak
| -rw-r--r-- | editor/plugins/tile_set_editor_plugin.cpp | 7 | ||||
| -rw-r--r-- | editor/plugins/tile_set_editor_plugin.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index 71c0d8a782..686ad566fd 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -401,7 +401,7 @@ void TileSetEditor::initialize_bottom_editor() { p.push_back((int)SHAPE_DELETE); tools[SHAPE_DELETE]->connect("pressed", this, "_on_tool_clicked", p); tool_containers[TOOLBAR_SHAPE]->add_child(tools[SHAPE_DELETE]); - tool_containers[TOOLBAR_SHAPE]->add_change_receptor(memnew(VSeparator)); + tool_containers[TOOLBAR_SHAPE]->add_child(memnew(VSeparator)); tools[SHAPE_KEEP_INSIDE_TILE] = memnew(ToolButton); tools[SHAPE_KEEP_INSIDE_TILE]->set_toggle_mode(true); tools[SHAPE_KEEP_INSIDE_TILE]->set_pressed(true); @@ -561,6 +561,11 @@ TileSetEditor::TileSetEditor(EditorNode *p_editor) { initialize_bottom_editor(); } +TileSetEditor::~TileSetEditor() { + if (helper) + memdelete(helper); +} + void TileSetEditor::_on_tile_list_selected(int p_index) { if (get_current_tile() >= 0) { current_item_index = p_index; diff --git a/editor/plugins/tile_set_editor_plugin.h b/editor/plugins/tile_set_editor_plugin.h index 0404c5236a..f57ec9a117 100644 --- a/editor/plugins/tile_set_editor_plugin.h +++ b/editor/plugins/tile_set_editor_plugin.h @@ -155,6 +155,7 @@ public: static Error update_library_file(Node *p_base_scene, Ref<TileSet> ml, bool p_merge = true); TileSetEditor(EditorNode *p_editor); + ~TileSetEditor(); private: void _on_tile_list_selected(int p_index); |