Skip to content

Commit

Permalink
3.2 - Fix Tween.is_active() always true after stop() and then start()
Browse files Browse the repository at this point in the history
Fix #39760 & #39801

These issues were resolved in master branch (and closed) but are still active in the 3.2 branch.
  • Loading branch information
jmb462 committed Mar 18, 2021
1 parent 94a0fc4 commit c695ef2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
15 changes: 15 additions & 0 deletions scene/animation/tween.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -855,8 +855,22 @@ bool Tween::start() {
return true;
}

pending_update++;
for (List<InterpolateData>::Element *E = interpolates.front(); E; E = E->next()) {
InterpolateData &data = E->get();
data.active = true;
}
pending_update--;

// We want to be activated
set_active(true);

// Don't resume from current position if stop_all() function has been used
if (was_stopped) {
seek(0);
}
was_stopped = false;

return true;
}

Expand Down Expand Up @@ -925,6 +939,7 @@ bool Tween::stop(Object *p_object, StringName p_key) {
bool Tween::stop_all() {
// We no longer need to be active since all tweens have been stopped
set_active(false);
was_stopped = true;

// For each interpolation...
pending_update++;
Expand Down
2 changes: 1 addition & 1 deletion scene/animation/tween.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class Tween : public Node {
float speed_scale;
mutable int pending_update;
int uid;

bool was_stopped = false;
List<InterpolateData> interpolates;

struct PendingCommand {
Expand Down

0 comments on commit c695ef2

Please sign in to comment.