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

Merge pull request #18693 from AndreaCatania/patch-1 

Fixed editor crash during editor closing
This commit is contained in:
Rémi Verschelde 2018-05-08 11:00:41 +02:00 committed by GitHub
parent de9683b605 6c4916ddf5
commit e854a71fac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/plugins/skeleton_editor_plugin.cpp
View File

@ -154,10 +154,7 @@ SkeletonEditor::SkeletonEditor() {
options->hide(); options->hide();
} }
SkeletonEditor::~SkeletonEditor() { SkeletonEditor::~SkeletonEditor() {}
SpatialEditor::get_singleton()->remove_child(options);
memdelete(options);
}
void SkeletonEditorPlugin::edit(Object *p_object) { void SkeletonEditorPlugin::edit(Object *p_object) {
skeleton_editor->edit(Object::cast_to<Skeleton>(p_object)); skeleton_editor->edit(Object::cast_to<Skeleton>(p_object));
@ -183,7 +180,4 @@ SkeletonEditorPlugin::SkeletonEditorPlugin(EditorNode *p_node) {
editor->get_viewport()->add_child(skeleton_editor); editor->get_viewport()->add_child(skeleton_editor);
} }
SkeletonEditorPlugin::~SkeletonEditorPlugin() { SkeletonEditorPlugin::~SkeletonEditorPlugin() {}
editor->get_viewport()->remove_child(skeleton_editor);
memdelete(skeleton_editor);
}