diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-05-08 11:00:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-08 11:00:41 +0200 |
commit | e854a71fac776cf49a0d65468e8130401eff3c6b (patch) | |
tree | 81f7300e1478d8123720aa216a221cbacd74d2ba /editor | |
parent | de9683b6059ed709441f28c42757de311cb409bb (diff) | |
parent | 6c4916ddf56e999e4dd3d85a2890cfa610d20ba6 (diff) |
Merge pull request #18693 from AndreaCatania/patch-1
Fixed editor crash during editor closing
Diffstat (limited to 'editor')
-rw-r--r-- | editor/plugins/skeleton_editor_plugin.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/editor/plugins/skeleton_editor_plugin.cpp b/editor/plugins/skeleton_editor_plugin.cpp index c41e3b546f..40a696119e 100644 --- a/editor/plugins/skeleton_editor_plugin.cpp +++ b/editor/plugins/skeleton_editor_plugin.cpp @@ -154,10 +154,7 @@ SkeletonEditor::SkeletonEditor() { options->hide(); } -SkeletonEditor::~SkeletonEditor() { - SpatialEditor::get_singleton()->remove_child(options); - memdelete(options); -} +SkeletonEditor::~SkeletonEditor() {} void SkeletonEditorPlugin::edit(Object *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); } -SkeletonEditorPlugin::~SkeletonEditorPlugin() { - editor->get_viewport()->remove_child(skeleton_editor); - memdelete(skeleton_editor); -} +SkeletonEditorPlugin::~SkeletonEditorPlugin() {} |