diff options
| author | K. S. Ernest (iFire) Lee <fire@users.noreply.github.com> | 2021-08-05 13:17:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-05 13:17:18 -0400 |
| commit | d393708e750c579623fb52b4122a0d0824dbd5f8 (patch) | |
| tree | c9fd2debfe48c3dd6905b09a9052537c59b2d39d | |
| parent | 48001d9cb9ed5dd0bc45e6ece1d953cb739292e9 (diff) | |
| parent | 6fa7cf13803b38085326772809fe38b7e702ce32 (diff) | |
Merge pull request #51285 from V-Sekai/reset-anim-spam
Reset baking should not spam on lack of animation players.
| -rw-r--r-- | editor/import/editor_importer_bake_reset.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/editor/import/editor_importer_bake_reset.cpp b/editor/import/editor_importer_bake_reset.cpp index 939c47faa4..541eab4f40 100644 --- a/editor/import/editor_importer_bake_reset.cpp +++ b/editor/import/editor_importer_bake_reset.cpp @@ -151,7 +151,9 @@ void BakeReset::_align_animations(AnimationPlayer *p_ap, const Map<StringName, B } void BakeReset::_fetch_reset_animation(AnimationPlayer *p_ap, Map<StringName, BakeResetRestBone> &r_rest_bones, const String &p_bake_anim) { - ERR_FAIL_NULL(p_ap); + if (!p_ap) { + return; + } List<StringName> anim_names; p_ap->get_animation_list(&anim_names); Node *root = p_ap->get_owner(); |