diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-11-15 14:24:07 -0500 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-11-15 14:24:07 -0500 |
| commit | 4a5836e5462554a738b502aa8bbde5e4a051eb56 (patch) | |
| tree | d58eaa8daad3e30c8b84a50e70a21f93b05525c5 /scene/animation/animation_tree.cpp | |
| parent | ac1a49725fc038ae11ef9060fecb2b0f9c6333b2 (diff) | |
| parent | 6c05ec3d6732cac44cf85c91db7d3fd1075bcb23 (diff) | |
| download | redot-engine-4a5836e5462554a738b502aa8bbde5e4a051eb56.tar.gz | |
Merge commit godotengine/godot@6c05ec3d6732cac44cf85c91db7d3fd1075bcb23
Diffstat (limited to 'scene/animation/animation_tree.cpp')
| -rw-r--r-- | scene/animation/animation_tree.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp index 7c49aac2b2..a63cf78f1c 100644 --- a/scene/animation/animation_tree.cpp +++ b/scene/animation/animation_tree.cpp @@ -373,7 +373,9 @@ AnimationNode::NodeTimeInfo AnimationNode::process(const AnimationMixer::Playbac AnimationMixer::PlaybackInfo pi = p_playback_info; if (p_playback_info.seeked) { - pi.delta = get_node_time_info().position - p_playback_info.time; + if (p_playback_info.is_external_seeking) { + pi.delta = get_node_time_info().position - p_playback_info.time; + } } else { pi.time = get_node_time_info().position + p_playback_info.delta; } |