godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore blend times for inexistent animations 

(cherry picked from commit fdf1977e8f)
This commit is contained in:
Pedro J. Estébanez 2020-07-02 19:22:09 +02:00 committed by Rémi Verschelde
parent 45b1234a82
commit a235bab96c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/animation/animation_player.cpp
View File

@ -1096,7 +1096,8 @@ void AnimationPlayer::get_animation_list(List<StringName> *p_animations) const {
} }
void AnimationPlayer::set_blend_time(const StringName &p_animation1, const StringName &p_animation2, float p_time) { void AnimationPlayer::set_blend_time(const StringName &p_animation1, const StringName &p_animation2, float p_time) {
ERR_FAIL_COND(!animation_set.has(p_animation1));
ERR_FAIL_COND(!animation_set.has(p_animation2));
ERR_FAIL_COND_MSG(p_time < 0, "Blend time cannot be smaller than 0."); ERR_FAIL_COND_MSG(p_time < 0, "Blend time cannot be smaller than 0.");
BlendKey bk; BlendKey bk;