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

Add newly shader built-ins to docs backport #6152

Merged
merged 1 commit into from
Sep 8, 2022

Conversation

paddy-exe
Copy link
Contributor

Backport of #6022
Docs of godotengine/godot#63971

@paddy-exe paddy-exe force-pushed the backport-shader-built-ins branch from f7448cc to e2daac4 Compare September 7, 2022 14:53
@paddy-exe
Copy link
Contributor Author

Thanks for your feedback @clayjohn! I updated it to your feedback

@clayjohn
Copy link
Member

clayjohn commented Sep 7, 2022

Great work!

Comment on lines 179 to 180
|| in bool **OUTPUT_IS_SRGB** || ``true`` when calculations happen in sRGB color space |
|| || (``true`` in GLES2, ``false`` in GLES3). |
Copy link
Member

Choose a reason for hiding this comment

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

Double |s

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can always count on you :D thanks for noticing

@paddy-exe paddy-exe force-pushed the backport-shader-built-ins branch from 8e4139f to 2b7c491 Compare September 8, 2022 11:03
@mhilbrunner mhilbrunner merged commit 401456d into godotengine:3.5 Sep 8, 2022
@mhilbrunner
Copy link
Member

Thank you!

@paddy-exe paddy-exe deleted the backport-shader-built-ins branch September 8, 2022 11:49
@YuriSizov
Copy link
Contributor

So, uhm, this is for 3.6, not 3.5...

@YuriSizov
Copy link
Contributor

Started the 3.6 branch with this PR merged, and reverted it in the 3.5 branch. Let me know if I everything is good. 🙂

@paddy-exe
Copy link
Contributor Author

@YuriSizov Seems good to me! Sorry, should have specified the PR for 3.6

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.

4 participants