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

Fix squish DXT5 RA-As-RG channel swapping #85967

Merged
merged 1 commit into from
Dec 16, 2023

Conversation

BlueCube3310
Copy link
Contributor

Follow-up to #85863

Fixes DXT5 RA-As-RG images using incorrect color channels after decompression, as well as cleans up some of the code.

Results:

master PR
ahah haha

MRP for testing the changes:
SquishRA_As_RG.zip

Steps to reproduce:

  1. Click on new_standard_material_3d.tres
  2. Look at the Normal Map preview.

@BlueCube3310 BlueCube3310 requested a review from a team as a code owner December 9, 2023 17:17
@AThousandShips AThousandShips added bug topic:import cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release labels Dec 9, 2023
@AThousandShips AThousandShips added this to the 4.3 milestone Dec 9, 2023
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! Tested locally and it works

@YuriSizov YuriSizov merged commit 4e29b16 into godotengine:master Dec 16, 2023
15 checks passed
@YuriSizov
Copy link
Contributor

Thanks!

@YuriSizov YuriSizov removed the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Jan 25, 2024
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.2.2.

@aaronfranke
Copy link
Member

aaronfranke commented Jan 31, 2024

This PR caused a regression: #87770

It's probably a good idea to undo the cherry-pick. The fix was quite simple so we can just cherry-pick the fix.

@fire
Copy link
Member

fire commented Jan 31, 2024

Do you want to make a pr to revert? or a pr to fix.

@aaronfranke
Copy link
Member

@fire I will wait for @BlueCube3310 and/or @clayjohn to respond.

@clayjohn
Copy link
Member

I think it makes sense to revert the cherrypick in 4.2. but then just fix the regression in master

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