maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge 74e8d5c7bd into 0529813cf2

Browse source
This commit is contained in:
Haoyu Qiu 2021-11-11 17:25:01 +09:00 committed by GitHub
parent 0529813cf2 74e8d5c7bd
commit 2723963a82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/animation/animation_blend_tree.cpp
View file

@ -67,7 +67,7 @@ float AnimationNodeAnimation::process(float p_time, bool p_seek) {
AnimationPlayer *ap = state->player;
ERR_FAIL_COND_V(!ap, 0);
float time = get_parameter(this->time);
const float current_time = get_parameter(this->time);
if (!ap->has_animation(animation)) {
AnimationNodeBlendTree *tree = Object::cast_to<AnimationNodeBlendTree>(parent);
@ -84,6 +84,7 @@ float AnimationNodeAnimation::process(float p_time, bool p_seek) {
Ref<Animation> anim = ap->get_animation(animation);
float time = current_time;
float step;
if (p_seek) {
@ -103,6 +104,7 @@ float AnimationNodeAnimation::process(float p_time, bool p_seek) {
} else if (time > anim_size) {
time = anim_size;
step = anim_size - current_time;
}
blend_animation(animation, time, step, p_seek, 1.0);