Merge pull request #58651 from TokageItLab/fix-cubic-interpolate-3.x

godotengine · Mar 4, 2022 · eb3f0f5 · eb3f0f5
2 parents 698ff3b + 7b9a912
commit eb3f0f5
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp
@@ -1718,11 +1718,19 @@ T Animation::_interpolate(const Vector<TKey<T>> &p_keys, float p_time, Interpola
 		case INTERPOLATION_CUBIC: {
 			int pre = idx - 1;
 			if (pre < 0) {
-				pre = 0;
+				if (loop && p_loop_wrap) {
+					pre = len - 1;
+				} else {
+					pre = 0;
+				}
 			}
 			int post = next + 1;
 			if (post >= len) {
-				post = next;
+				if (loop && p_loop_wrap) {
+					post = 0;
+				} else {
+					post = next;
+				}
 			}
 
 			return _cubic_interpolate(p_keys[pre].value, p_keys[idx].value, p_keys[next].value, p_keys[post].value, c);