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

[Merged by Bors] - Fix shader syntax #5613

Closed
wants to merge 4 commits into from
Closed

[Merged by Bors] - Fix shader syntax #5613

wants to merge 4 commits into from

Conversation

timokoesters
Copy link
Contributor

@timokoesters timokoesters commented Aug 8, 2022 •
edited by bors bot
Loading

No description provided.

@jakobhellermann jakobhellermann added A-Rendering Drawing game state to the screen C-Docs An addition or correction to our documentation labels Aug 8, 2022
NiklasEi
NiklasEi approved these changes Aug 8, 2022
View reviewed changes
Copy link
Member

@NiklasEi NiklasEi left a comment

Choose a reason for hiding this comment

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

Nice catch

@NiklasEi NiklasEi added the S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it label Aug 8, 2022
tim-blackbird
tim-blackbird suggested changes Aug 8, 2022
View reviewed changes
Copy link
Contributor

@tim-blackbird tim-blackbird left a comment

Choose a reason for hiding this comment

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

The struct definition is still using the old syntax :)

@timokoesters
Copy link
Contributor Author

I fixed the struct syntax now @devil-ira

@cart
Copy link
Member

cart commented Aug 8, 2022

I fixed the struct syntax now @devil-ira

Not quite. Still needs to use , after each field instead of ;

@cart
Copy link
Member

cart commented Aug 8, 2022

bors r+

@timokoesters
Copy link
Contributor Author

I fixed that and fixed the other Material file too

bors bot pushed a commit that referenced this pull request Aug 8, 2022
@timokoesters
Fix shader syntax (#5613)
2ac7443
@bors
Copy link
Contributor

bors bot commented Aug 8, 2022

Pull request successfully merged into main.

Build succeeded:

@bors bors bot changed the title Fix shader syntax [Merged by Bors] - Fix shader syntax Aug 8, 2022
@bors bors bot closed this Aug 8, 2022
maccesch pushed a commit to Synphonyte/bevy that referenced this pull request Sep 28, 2022
@timokoesters @maccesch
Fix shader syntax (bevyengine#5613)
b2b57d7
james7132 pushed a commit to james7132/bevy that referenced this pull request Oct 28, 2022
@timokoesters @james7132
Fix shader syntax (bevyengine#5613)
12c85a0
ItsDoot pushed a commit to ItsDoot/bevy that referenced this pull request Feb 1, 2023
@timokoesters @ItsDoot
Fix shader syntax (bevyengine#5613)
9b34135
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tim-blackbird tim-blackbird tim-blackbird requested changes

@jakobhellermann jakobhellermann jakobhellermann approved these changes

@BorisBoutillier BorisBoutillier BorisBoutillier approved these changes

@NiklasEi NiklasEi NiklasEi approved these changes

Assignees
No one assigned
Labels
A-Rendering Drawing game state to the screen C-Docs An addition or correction to our documentation S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@timokoesters @cart @NiklasEi @BorisBoutillier @jakobhellermann @tim-blackbird