godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38086 from volzhs/seek-animation-finished 

Emit signal when animation ends by seek
This commit is contained in:
Rémi Verschelde 2020-04-22 10:07:29 +02:00 committed by GitHub
parent 02200e2865 bf1cc116e1
commit f989a43135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/animation/animation_player.cpp
View File

@ -950,13 +950,13 @@ void AnimationPlayer::_animation_process(float p_delta) {
play(queued.front()->get()); play(queued.front()->get());
String new_name = playback.assigned; String new_name = playback.assigned;
queued.pop_front(); queued.pop_front();
if (end_notify) if (end_notify || playback.seeked)
emit_signal(SceneStringNames::get_singleton()->animation_changed, old, new_name); emit_signal(SceneStringNames::get_singleton()->animation_changed, old, new_name);
} else { } else {
//stop(); //stop();
playing = false; playing = false;
_set_process(false); _set_process(false);
if (end_notify) if (end_notify || playback.seeked)
emit_signal(SceneStringNames::get_singleton()->animation_finished, playback.assigned); emit_signal(SceneStringNames::get_singleton()->animation_finished, playback.assigned);
} }
end_reached = false; end_reached = false;