Merge pull request #21405 from SneakyMax/fix-animation-condition-advancing

Fix advancing based on condition in AnimationNodeStateMachinePlayback
This commit is contained in:
Juan Linietsky 2018-08-27 13:04:02 -03:00 committed by GitHub
commit 02d2676dc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -390,7 +390,7 @@ float AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *sm,
auto_advance = true;
}
if (sm->transitions[i].from == current && sm->transitions[i].transition->has_auto_advance()) {
if (sm->transitions[i].from == current && auto_advance) {
if (sm->transitions[i].transition->get_priority() < priority_best) {
auto_advance_to = i;