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 wrong shader rename in 3-to-4 project converter #83708

Merged
merged 1 commit into from
Nov 12, 2023
Merged

Fix wrong shader rename in 3-to-4 project converter #83708

merged 1 commit into from
Nov 12, 2023

Conversation

guilhermevfa
Copy link
Contributor

@guilhermevfa guilhermevfa commented Oct 21, 2023 •
edited by akien-mga
Loading

Fixes depth_draw_alpha_prepass wrong conversion.

Fixes part of #63673 (?)

@guilhermevfa guilhermevfa changed the title Adds missing shaders renames and fix wrong shader rename Fix wrong shader rename Oct 21, 2023
@guilhermevfa @BrunoArmondBraga
Fix wrong shader rename
7a76d5e 
Co-authored-by: BrunoArmondBraga <[email protected]>
@AThousandShips AThousandShips added this to the 4.2 milestone Oct 21, 2023
@guilhermevfa guilhermevfa marked this pull request as ready for review October 27, 2023 23:20
@YuriSizov
Copy link
Contributor

Seems to have been added like that in #64396, but I see no justification (nor is it really related to what that PR was supposed to be doing).

I'm not sure either option is correct, cc @clayjohn

@YuriSizov YuriSizov added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Nov 2, 2023
@guilhermevfa
Copy link
Contributor Author

Just to clarify, in the Godot 3.5 docs, the depth_draw_alpha_prepass description is "do opaque depth pre-pass for transparent geometry", which is exactly the depth_prepass_alpha description on Godot 4.1 docs. That's why I think the conversion is currently wrong.

@akien-mga akien-mga merged commit d443f12 into godotengine:master Nov 12, 2023
15 checks passed
@akien-mga
Copy link
Member

Thanks!

@akien-mga akien-mga changed the title Fix wrong shader rename Fix wrong shader rename in 3-to-4 project converter Nov 13, 2023
@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

Cherry-picked for 4.1.4.

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

@akien-mga akien-mga akien-mga approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@guilhermevfa @YuriSizov @akien-mga @AThousandShips