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

Jump to bottom

Blend the animation playback track when timestamp value is manually changed #86298

Closed
wants to merge 1 commit into from
Closed

Blend the animation playback track when timestamp value is manually changed #86298

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: 2 additions & 2 deletions scene/animation/animation_mixer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1569,7 +1569,7 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
}
} break;
case Animation::TYPE_ANIMATION: {
if (p_update_only || Math::is_zero_approx(blend)) {
if (Math::is_zero_approx(blend)) {
continue;
}
TrackCacheAnimation *t = static_cast<TrackCacheAnimation *>(track);
Expand Down Expand Up @@ -1603,7 +1603,7 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
default:
break;
}
if (player2->is_playing() || seeked) {
if (!p_update_only && (player2->is_playing() || seeked)) {
player2->seek(at_anim_pos);
player2->play(anim_name);
t->playing = true;
Expand Down
Loading