diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-21 22:27:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-21 22:27:50 +0100 |
commit | 5127afa812f80c02e6f9fada854d46482daafca4 (patch) | |
tree | 8e4bf30bde2e456fe430f97dd0139febf6a332a0 /editor/animation_track_editor.cpp | |
parent | 6190690757ca322393f13e44bc2ceed79b362b45 (diff) | |
parent | 4faaf6089a3880d673c5fc51a260128bfe59b351 (diff) |
Merge pull request #35413 from akien-mga/if-0-means-couperet
Remove unused #if 0'ed code
Diffstat (limited to 'editor/animation_track_editor.cpp')
-rw-r--r-- | editor/animation_track_editor.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index f6d5312fc7..22a5298d5c 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -4838,25 +4838,6 @@ 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); - go_back = true; - } - - memdelete(key_edit); - key_edit = NULL; - - 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()->get_inspector()->get_edited_object() == multi_key_edit) { @@ -4871,7 +4852,6 @@ void AnimationTrackEditor::_clear_key_edit() { memdelete(multi_key_edit); multi_key_edit = NULL; } -#endif } } |