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

AnimationTreePlayer (_process_node:TIMESEEK): give p_seek precedence over tsn->seek_pos.

Browse Source
This commit is contained in:
Josh Grams 2016-03-31 10:06:38 -04:00
parent 8920ab0fbf
commit 7fe28d4168
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/animation/animation_tree_player.cpp
View File

@ -652,13 +652,13 @@ float AnimationTreePlayer::_process_node(const StringName& p_node,AnimationNode
case NODE_TIMESEEK: { case NODE_TIMESEEK: {
TimeSeekNode *tsn = static_cast<TimeSeekNode*>(nb); TimeSeekNode *tsn = static_cast<TimeSeekNode*>(nb);
if (tsn->seek_pos>=0) { if (tsn->seek_pos>=0 && !p_seek) {
float res = _process_node(tsn->inputs[0].node,r_prev_anim,p_weight,tsn->seek_pos,true,p_filter,p_reverse_weight); p_time = tsn->seek_pos;
p_seek = true;
}
tsn->seek_pos=-1; tsn->seek_pos=-1;
return res;
} else
return _process_node(tsn->inputs[0].node,r_prev_anim,p_weight,p_time,p_seek); return _process_node(tsn->inputs[0].node,r_prev_anim,p_weight,p_time,p_seek);
} break; } break;