diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-03-11 16:19:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-11 16:19:14 +0100 |
commit | 7b67c5857fd7715774c7a2e07a05ff1fb7304ed1 (patch) | |
tree | 2e91467a0773feba6ee2ecdaf4ebace59d39cf11 /editor | |
parent | 154b6f01337d932d8a259ed93aa5aec397f9de6e (diff) | |
parent | d6e4a08c614da72c4ade71f326b7b4cf33b53707 (diff) |
Merge pull request #26901 from KidRigger/anim_crash
Prevents a Null Reference in deleting Animations.
Diffstat (limited to 'editor')
-rw-r--r-- | editor/animation_track_editor.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index c561cdc249..8807a01f64 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -3424,6 +3424,10 @@ void AnimationTrackEditor::_animation_update() { bool same = true; + if (animation.is_null()) { + return; + } + if (track_edits.size() == animation->get_track_count()) { //check tracks are the same |