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

Revert premul alpha to spell without the T #91399

Merged
merged 1 commit into from
May 1, 2024

Conversation

QbieShay
Copy link
Contributor

@QbieShay QbieShay commented May 1, 2024

Follow up for #85609

Changed naming back to keep (in)consistencies with 2D.

@QbieShay QbieShay requested a review from a team as a code owner May 1, 2024 09:13
@Chaosus Chaosus added this to the 4.3 milestone May 1, 2024
@akien-mga akien-mga changed the title fixed premul alpha typo in material.cpp and docs Fix premul alpha typo in material.cpp and docs May 1, 2024
@QbieShay QbieShay force-pushed the qbe/fix-pmul-name branch from 4e97b58 to b6c25b3 Compare May 1, 2024 09:24
@QbieShay QbieShay force-pushed the qbe/fix-pmul-name branch from b6c25b3 to 9b10f99 Compare May 1, 2024 09:44
@QbieShay QbieShay force-pushed the qbe/fix-pmul-name branch from 9b10f99 to 9f099b5 Compare May 1, 2024 19:18
@QbieShay QbieShay requested a review from a team as a code owner May 1, 2024 19:18
@QbieShay QbieShay requested review from akien-mga and clayjohn May 1, 2024 19:21
@QbieShay QbieShay changed the title Fix premul alpha typo in material.cpp and docs Revert premul alpha to spell without the T May 1, 2024
Copy link
Member

@clayjohn clayjohn left a comment

Choose a reason for hiding this comment

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

Looks good to me. This aligns with the naming of the CanvasItem blend mode (which is admittedly inconsistent).

doc/classes/BaseMaterial3D.xml Outdated Show resolved Hide resolved
@QbieShay QbieShay force-pushed the qbe/fix-pmul-name branch from 9f099b5 to db06397 Compare May 1, 2024 20:24
Initially 3d had premulT alpha as a keyword.
Since Canvas item uses mixed premul and premult as keywords,
3D is changed as well to keep consistency with 2D.
Unfortunately this keeps inconsistency with the internal ENUM.
@QbieShay QbieShay force-pushed the qbe/fix-pmul-name branch from db06397 to e410643 Compare May 1, 2024 20:24
Copy link
Member

@clayjohn clayjohn left a comment

Choose a reason for hiding this comment

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

Looks great. We now need add blend_premul_alpha and PREMUL_ALPHA to the spatial shader docs https://docs.godotengine.org/en/latest/tutorials/shaders/shader_reference/spatial_shader.html

@akien-mga akien-mga merged commit f91db3d into godotengine:master May 1, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

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.

6 participants