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

Change AnimationLibEditor's mixer to actual Mixer #84551

Merged
merged 1 commit into from
Nov 7, 2023
Merged

Change AnimationLibEditor's mixer to actual Mixer #84551

merged 1 commit into from
Nov 7, 2023

Conversation

KoBeWi
Copy link
Member

@KoBeWi KoBeWi commented Nov 6, 2023

The variable was Object for no reason.

@KoBeWi KoBeWi added this to the 4.3 milestone Nov 6, 2023
@KoBeWi KoBeWi requested a review from TokageItLab November 6, 2023 22:29
@KoBeWi KoBeWi mentioned this pull request Nov 6, 2023
Merged
TokageItLab
TokageItLab approved these changes Nov 7, 2023
View reviewed changes
Copy link
Member

@TokageItLab TokageItLab left a comment

Choose a reason for hiding this comment

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

It may have been necessary to separate them at the time of prototyping for dummy players, but this is definitely the right way to do it now, and it works fine as far as I have tested it.

@TokageItLab TokageItLab modified the milestones: 4.3, 4.2 Nov 7, 2023
YuriSizov
YuriSizov reviewed Nov 7, 2023
View reviewed changes
editor/plugins/animation_library_editor.cpp
Comment on lines 40 to 42
void AnimationLibraryEditor::set_animation_mixer(Object *p_mixer) {
mixer = p_mixer;
mixer = Object::cast_to<AnimationMixer>(p_mixer);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm concerned we don't handle null anywhere, which it can be (even without a cast). But that's already present in this code, so this PR doesn't make things worse.

@YuriSizov YuriSizov merged commit a956f2f into godotengine:master Nov 7, 2023
15 checks passed
@YuriSizov
Copy link
Contributor

Thanks!

@KoBeWi KoBeWi deleted the manage_animations_like_a_proper_human_being branch November 7, 2023 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YuriSizov YuriSizov YuriSizov left review comments

@TokageItLab TokageItLab TokageItLab approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@KoBeWi @YuriSizov @TokageItLab