From e5b876e92a76a6521840ccda7bb16e49967fff8d Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Fri, 8 Jun 2018 19:21:26 -0300 Subject: [PATCH] Remove the "go back" behavior in track editor for inspector based key editing, fixes #19434, fixes #19423 --- editor/animation_track_editor.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index 9e06331e6f9..c37b311506e 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -3873,6 +3873,12 @@ struct _AnimMoveRestore { void AnimationTrackEditor::_clear_key_edit() { if (key_edit) { + +#if 0 + // going back seems like the most comfortable thing to do, but it results + // in weird behaviors and crashes, because going back to animation editor + // triggers the editor setting up again itself + bool go_back = false; if (EditorNode::get_singleton()->get_inspector()->get_edited_object() == key_edit) { EditorNode::get_singleton()->push_item(NULL); @@ -3885,6 +3891,15 @@ void AnimationTrackEditor::_clear_key_edit() { if (go_back) { EditorNode::get_singleton()->get_inspector_dock()->go_back(); } +#else + //if key edit is the object being inspected, remove it first + if (EditorNode::get_singleton()->get_inspector()->get_edited_object() == key_edit) { + EditorNode::get_singleton()->push_item(NULL); + } + //then actually delete it + memdelete(key_edit); + key_edit = NULL; +#endif } }