godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17072 from Noshyaar/leak 

TileSetEditorPlgn: Fix a leak
This commit is contained in:
Rémi Verschelde 2018-02-27 11:17:12 +01:00 committed by GitHub
parent 75c7e66c5e 762f241e10
commit 9a37d423c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/plugins/tile_set_editor_plugin.cpp
View File

@ -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;

1
editor/plugins/tile_set_editor_plugin.h
View File

@ -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);