summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Grams <josh@qualdan.com>2016-04-06 15:07:58 -0400
committerJosh Grams <josh@qualdan.com>2016-04-06 15:07:58 -0400
commit1b95dca6bd8113503f4da21c148f7eb98e7722e6 (patch)
tree79b8a977fe3d29a38625866d39582005c86fceb3
parent5d6b58fea69ab78cb04f1f52eed3b2aee0ec9207 (diff)
AnimationTreePlayer (set_active, reset, constructor): seek all animations to start.
-rw-r--r--scene/animation/animation_tree_player.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp
index 9c2235de78..0f8599706e 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -1604,6 +1604,7 @@ void AnimationTreePlayer::set_active(bool p_active) {
active = p_active;
processing = active;
+ reset_request = p_active;
_set_process(processing, true);
}
@@ -1621,7 +1622,7 @@ AnimationTreePlayer::ConnectError AnimationTreePlayer::get_last_error() const {
void AnimationTreePlayer::reset() {
- reset_request=false;
+ reset_request=true;
}
@@ -1863,7 +1864,7 @@ AnimationTreePlayer::AnimationTreePlayer() {
processing = false;
active=false;
dirty_caches=true;
- reset_request=false;
+ reset_request=true;
last_error=CONNECT_INCOMPLETE;
base_path=String("..");
}