summaryrefslogtreecommitdiff
path: root/editor/import
diff options
context:
space:
mode:
authorK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2021-08-05 09:14:27 -0700
committerK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2021-08-05 09:14:27 -0700
commit6fa7cf13803b38085326772809fe38b7e702ce32 (patch)
tree5a64495dd97f238b1a210787b4043b94163aa559 /editor/import
parenta544e77822b40b39198f92ee3346bbfe7921ac41 (diff)
Reset baking should not spam on lack of animation players.
Diffstat (limited to 'editor/import')
-rw-r--r--editor/import/editor_importer_bake_reset.cpp4
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();