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

Fixing wrong blending rect methods #39200

Merged
merged 1 commit into from
Jun 7, 2020
Merged

Fixing wrong blending rect methods #39200

merged 1 commit into from
Jun 7, 2020

Conversation

azagaya
Copy link
Contributor

@azagaya azagaya commented May 31, 2020

Using Color.blend function instead of custom code

Fixes #31124
Related to #37503. Im leaving both PR's cause i'm not sure what would you prefer.

@azagaya
Fixing wrong blending rect methods
b211a86 
Using Color.blend function instead of custom code

Fixed clang_format

Removed unnecessary help
clayjohn
clayjohn approved these changes May 31, 2020
View reviewed changes
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. I am more comfortable with this than #37503. Its nice to know that the various blend functions are consistent.

Since it is core, this will still need reduz' approval.

@akien-mga akien-mga added this to the 4.0 milestone Jun 2, 2020
@akien-mga akien-mga requested a review from reduz June 2, 2020 14:28
@akien-mga akien-mga mentioned this pull request Jun 7, 2020
Closed
@akien-mga
Copy link
Member

Approved by @reduz:

15:50 <reduz> Akien: yeah makes sense
15:50 <reduz> this is correct blending including source and destination alpha
15:51 <reduz> I am unsure why GPUs as of today cant do it

@akien-mga akien-mga merged commit ec1bf96 into godotengine:master Jun 7, 2020
@akien-mga
Copy link
Member

Thanks!

@akien-mga akien-mga added the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Jun 7, 2020
@azagaya azagaya deleted the fix-blend-2 branch June 7, 2020 14:08
@akien-mga
Copy link
Member

Cherry-picked for 3.2.2.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Jun 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clayjohn clayjohn clayjohn approved these changes

@reduz reduz Awaiting requested review from reduz

Assignees
No one assigned
Labels
bug topic:core
Projects
None yet
Milestone
4.0
Development

Successfully merging this pull request may close these issues.

Image::blend_rect might not blend as expected
3 participants
@azagaya @akien-mga @clayjohn