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.

Sign up for GitHub

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

Jump to bottom

Fix RESET not effective when saving inactive scene #84405

Merged
merged 1 commit into from
Nov 6, 2023
Merged

Fix RESET not effective when saving inactive scene #84405

merged 1 commit into from
Nov 6, 2023

Conversation

KoBeWi
Copy link
Member

@KoBeWi KoBeWi commented Nov 3, 2023

Fixes #83304
Aside from the error, the RESET tracks weren't applied.

@KoBeWi KoBeWi added this to the 4.3 milestone Nov 3, 2023
@KoBeWi KoBeWi requested a review from a team as a code owner November 3, 2023 12:00
@YuriSizov YuriSizov added cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release labels Nov 3, 2023
SaracenOne
SaracenOne approved these changes Nov 4, 2023
View reviewed changes
Copy link
Member

@SaracenOne SaracenOne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, LGTM 👍

@YuriSizov YuriSizov modified the milestones: 4.3, 4.2 Nov 6, 2023
@YuriSizov YuriSizov removed the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Nov 6, 2023
@YuriSizov YuriSizov merged commit dfcbc1d into godotengine:master Nov 6, 2023
15 checks passed
@YuriSizov
Copy link
Contributor

Thanks!

@KoBeWi KoBeWi deleted the no_escaping_the_RESET branch November 6, 2023 12:45
@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Jan 23, 2024
@YuriSizov
Copy link
Contributor

I was overzealous with the cherry-picking labels. Since this was done post-AnimationMixer, we'd need a separate PR for 4.1 if this issue is present in that version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SaracenOne SaracenOne SaracenOne approved these changes

@TokageItLab TokageItLab TokageItLab approved these changes

Assignees
No one assigned
Labels
bug topic:animation topic:editor
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.

scene/main/node.cpp:2006 - Parameter "common_parent" is null.
4 participants
@KoBeWi @YuriSizov @SaracenOne @TokageItLab