3.2 - Fix Tween.is_active() always true after stop() and then start()
Fix #39760 & #39801 These issues were resolved in master branch (and closed) but are still active in the 3.2 branch.
This commit is contained in:
parent
94a0fc47f7
commit
c695ef29b8
2 changed files with 16 additions and 1 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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++;
|
||||
|
|
|
@ -115,7 +115,7 @@ private:
|
|||
float speed_scale;
|
||||
mutable int pending_update;
|
||||
int uid;
|
||||
|
||||
bool was_stopped = false;
|
||||
List<InterpolateData> interpolates;
|
||||
|
||||
struct PendingCommand {
|
||||
|
|
Loading…
Reference in a new issue