diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-15 08:54:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 08:54:07 +0100 |
| commit | 05b1843818fd07f084816ec506ec505e24f8f02c (patch) | |
| tree | 71587fa95b923335bca54d0776dd1b67b837fc96 /scene/animation/animation_player.h | |
| parent | cd62fd48f99a76697483c8c9f9ee86d63f63b912 (diff) | |
| parent | f2355949c458bcc0eaf967f57d782520a168f563 (diff) | |
Merge pull request #15696 from bojidar-bg/15646-assigned-animation
Fix an issue with the animation editor not seeking to the target time
Diffstat (limited to 'scene/animation/animation_player.h')
| -rw-r--r-- | scene/animation/animation_player.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h index ef1720443f..ef758bac44 100644 --- a/scene/animation/animation_player.h +++ b/scene/animation/animation_player.h @@ -284,6 +284,8 @@ public: bool is_playing() const; String get_current_animation() const; void set_current_animation(const String &p_anim); + String get_assigned_animation() const; + void set_assigned_animation(const String &p_anim); void stop_all(); void set_active(bool p_active); bool is_active() const; |