Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.x] Fix AnimationTree function call track loop #54827

Merged
merged 1 commit into from
Jan 19, 2022
Merged

[3.x] Fix AnimationTree function call track loop #54827

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion scene/animation/animation_blend_tree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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) {
Expand All @@ -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);
Expand Down