Browse Source

Merge pull request #18693 from AndreaCatania/patch-1

Fixed editor crash during editor closing
Rémi Verschelde 7 years ago
parent
commit
e854a71fac
1 changed files with 2 additions and 8 deletions
  1. 2 8
      editor/plugins/skeleton_editor_plugin.cpp

+ 2 - 8
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() {}