diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-05-02 14:22:41 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-02 14:22:41 -0300 |
| commit | bbac15388a0dc5f45f272f54209996a3b315757c (patch) | |
| tree | d908571158af8d0222eb2d77bf2881b0b38e00a2 | |
| parent | bac283a8748d78ac9f99a9f7198108eba18b3ea9 (diff) | |
| parent | 78eccd61f8afca377d3eb88d1987811619cb557d (diff) | |
Merge pull request #4527 from godotengine/revert-4518-animationplayer-finished-name
Revert "added name parameter on animationplayer finished"
| -rw-r--r-- | scene/animation/animation_player.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 9d5d52b816..25f49a8a8b 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -728,11 +728,10 @@ void AnimationPlayer::_animation_process(float p_delta) { emit_signal(SceneStringNames::get_singleton()->animation_changed, old, new_name); } else { //stop(); - String name = playback.assigned; playing = false; _set_process(false); end_notify=false; - emit_signal(SceneStringNames::get_singleton()->finished, name); + emit_signal(SceneStringNames::get_singleton()->finished); } } @@ -1348,7 +1347,7 @@ void AnimationPlayer::_bind_methods() { ADD_PROPERTY( PropertyInfo( Variant::REAL, "playback/default_blend_time", PROPERTY_HINT_RANGE, "0,4096,0.01"), _SCS("set_default_blend_time"), _SCS("get_default_blend_time")); ADD_PROPERTY( PropertyInfo( Variant::NODE_PATH, "root/root"), _SCS("set_root"), _SCS("get_root")); - ADD_SIGNAL( MethodInfo("finished", PropertyInfo(Variant::STRING,"name")) ); + ADD_SIGNAL( MethodInfo("finished") ); ADD_SIGNAL( MethodInfo("animation_changed", PropertyInfo(Variant::STRING,"old_name"), PropertyInfo(Variant::STRING,"new_name")) ); ADD_SIGNAL( MethodInfo("animation_started", PropertyInfo(Variant::STRING,"name")) ); |