Merge pull request #89329 from TokageItLab/fix-flag-discrete

akien-mga · akien-mga · commit f45207bbf2d4 · 2024-03-09T22:20:16.000+01:00
Fix wrong line of making flag to discrete in AnimationMixer
diff --git a/scene/animation/animation_mixer.cpp b/scene/animation/animation_mixer.cpp
@@ -1453,6 +1453,7 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
 							t->value = Animation::blend_variant(t->value, value, blend);
 						}
 					} else {
+						t->use_discrete = true;
 						if (seeked) {
 							int idx = a->track_find_key(i, time, is_external_seeking ? Animation::FIND_MODE_NEAREST : Animation::FIND_MODE_EXACT, true);
 							if (idx < 0) {
@@ -1476,7 +1477,6 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
 								}
 							}
 						}
-						t->use_discrete = true;
 					}
 				} break;
 				case Animation::TYPE_METHOD: {

Original file line number	Diff line number	Diff line change
`@@ -1453,6 +1453,7 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {`
`1453`	`1453`	`t->value = Animation::blend_variant(t->value, value, blend);`
`1454`	`1454`	`}`
`1455`	`1455`	`} else {`
	`1456`	`+ t->use_discrete = true;`
`1456`	`1457`	`if (seeked) {`
`1457`	`1458`	`int idx = a->track_find_key(i, time, is_external_seeking ? Animation::FIND_MODE_NEAREST : Animation::FIND_MODE_EXACT, true);`
`1458`	`1459`	`if (idx < 0) {`
`@@ -1476,7 +1477,6 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {`
`1476`	`1477`	`}`
`1477`	`1478`	`}`
`1478`	`1479`	`}`
`1479`		`- t->use_discrete = true;`
`1480`	`1480`	`}`
`1481`	`1481`	`} break;`
`1482`	`1482`	`case Animation::TYPE_METHOD: {`