summaryrefslogtreecommitdiff
path: root/scene/animation
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2020-12-29 10:39:27 +0100
committerGitHub <noreply@github.com>2020-12-29 10:39:27 +0100
commit8a14dc746a15a62e14ac9ba9549b70bac709830c (patch)
tree4fe74909f95d303bd3814291fa67fa03267a0b4a /scene/animation
parentc6e9d912e129373d81e6610a3733ffc7fb7a146b (diff)
parent09212fba1ebbb29595456b01bf25c0ca80592a2d (diff)
Merge pull request #44788 from akien-mga/container-is_empty
Fix missed renamings from empty() to is_empty()
Diffstat (limited to 'scene/animation')
-rw-r--r--scene/animation/animation_player.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index 159ccae130..506106687b 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -782,13 +782,13 @@ void AnimationPlayer::_animation_process_data(PlaybackData &cd, float p_delta, f
delta = next_pos - cd.pos; // Fix delta (after determination of backwards because negative zero is lost here)
if (&cd == &playback.current) {
- if (!backwards && cd.pos <= len && next_pos == len /*&& playback.blend.empty()*/) {
+ if (!backwards && cd.pos <= len && next_pos == len) {
//playback finished
end_reached = true;
end_notify = cd.pos < len; // Notify only if not already at the end
}
- if (backwards && cd.pos >= 0 && next_pos == 0 /*&& playback.blend.empty()*/) {
+ if (backwards && cd.pos >= 0 && next_pos == 0) {
//playback finished
end_reached = true;
end_notify = cd.pos > 0; // Notify only if not already at the beginning