diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-12 08:11:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 08:11:46 +0200 |
| commit | f88593ce5fbb723c447d3be1cbf6449fbac06da2 (patch) | |
| tree | e256017d07b97fe84c3a5e10b72a1d397a960932 | |
| parent | df598e8fb648977720c846241554762b3e93ab94 (diff) | |
| parent | 96f077a18d7d1bfc710233b467810f6f7e39b4ce (diff) | |
Merge pull request #51541 from timothyqiu/reset-crash
Fixes crash when AnimationPlayer reset on save
| -rw-r--r-- | editor/editor_node.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 8748d021b6..30edbd1e87 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1606,7 +1606,9 @@ static void _reset_animation_players(Node *p_node, List<Ref<AnimatedValuesBackup AnimationPlayer *player = Object::cast_to<AnimationPlayer>(p_node->get_child(i)); if (player && player->is_reset_on_save_enabled() && player->can_apply_reset()) { Ref<AnimatedValuesBackup> old_values = player->apply_reset(); - r_anim_backups->push_back(old_values); + if (old_values.is_valid()) { + r_anim_backups->push_back(old_values); + } } _reset_animation_players(p_node->get_child(i), r_anim_backups); } |