Skip to content

Conversation

@Hex-4
Copy link
Contributor

@Hex-4 Hex-4 commented Oct 1, 2023

closes #7690

This PR clarifies the syntax for adding both a default value and a hint for shader uniforms.

Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
Copy link
Contributor

@skyace65 skyace65 left a comment

Choose a reason for hiding this comment

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

Commits need to be squashed, but other than that this looks good.

@Hex-4
Copy link
Contributor Author

Hex-4 commented Oct 1, 2023

Do I need to squash the commits, or does someone else do it?

@skyace65
Copy link
Contributor

skyace65 commented Oct 1, 2023

We prefer that contributors do it themselves, however in the docs repository maintainers can do a squash and merge (we can't do this in the engine repository). It's not a big deal since it's your first PR here but just keep it in mind for the future. If you don't know how to keep everything to one commit we have a guide here.

@mhilbrunner mhilbrunner merged commit 37a96ba into godotengine:master Oct 2, 2023
@mhilbrunner
Copy link
Member

Squashed and merged. Thanks for contributing :)

@Piralein Piralein added enhancement area:manual Issues and PRs related to the Manual/Tutorials section of the documentation cherrypick:4.0 cherrypick:4.1 labels Oct 2, 2023
@Hex-4 Hex-4 deleted the add-shader-hint-info branch October 2, 2023 13:29
mhilbrunner pushed a commit that referenced this pull request Oct 8, 2023
* add comment for default values

* Add a line telling where the default value goes

---------

Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
@mhilbrunner
Copy link
Member

Cherry-picked to 4.1

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

Labels

area:manual Issues and PRs related to the Manual/Tutorials section of the documentation cherrypick:4.0 enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

In shading_language > uniforms Add example of hint with default value

5 participants