Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix linear interpolation not working with mixed (int/float) keyframes #86046

Merged
merged 1 commit into from
Dec 13, 2023

Conversation

bs-mwoerner
Copy link
Contributor

Fixes #85858.

It is possible in the editor to create both integer and float keyframes on an animation track. With the rework of variant interpolation and blending (#84815), linear interpolation lost its ability to interpolate between such keyframes (cubic interpolation works). This PR restores a special case handling for int/float pairs similar to what was there before the rework.

@AThousandShips AThousandShips requested a review from a team December 12, 2023 09:57
@AThousandShips AThousandShips added this to the 4.3 milestone Dec 12, 2023
@bs-mwoerner bs-mwoerner force-pushed the linear_animation_typemix branch from 502790f to 26126bd Compare December 12, 2023 10:24
scene/resources/animation.cpp Outdated Show resolved Hide resolved
@bs-mwoerner bs-mwoerner force-pushed the linear_animation_typemix branch from 26126bd to 88c4820 Compare December 12, 2023 22:06
scene/resources/animation.cpp Outdated Show resolved Hide resolved
@bs-mwoerner bs-mwoerner force-pushed the linear_animation_typemix branch from 88c4820 to 12ce2e3 Compare December 12, 2023 23:32
@akien-mga akien-mga added cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release regression labels Dec 13, 2023
@akien-mga akien-mga merged commit 7635530 into godotengine:master Dec 13, 2023
15 checks passed
@akien-mga
Copy link
Member

Thanks!

@YuriSizov
Copy link
Contributor

Cherry-picked for 4.2.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Linear keyframe interpolation not working for Control anchor offsets
5 participants