[Merged by Bors] - Fix PBR regression for unlit materials #2197
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alice-i-cecile
added
P-Regression
mockersf
approved these changes
May 17, 2021
mockersf
added
the
S-Ready-For-Final-Review
|
Please add an unlit material to one of the examples, to help us catch this in the future. |
|
Added a test to the pbr example, seeing as the pbr shader file held the regression. Bumped up the spheres a row, and improved the camera and lighting while I was at it, to remove projection distortion and varying light direction.
|
|
bors r+ |
bors bot
pushed a commit
that referenced
this pull request
May 17, 2021
Fixes the frag shader for unlit materials by correcting the scope of the `#ifndef` to include the light functions. Closes #2190, introduced in #2112. Tested by changing materials in the the `3d_scene` example to be unlit. Unsure how to prevent future regressions without creating a test case scene that will catch these runtime panics.
|
Pull request successfully merged into main. Build succeeded: |
bors
bot
changed the title
ostwilkens
pushed a commit
to ostwilkens/bevy
that referenced
this pull request
Jul 27, 2021
Fixes the frag shader for unlit materials by correcting the scope of the `#ifndef` to include the light functions. Closes bevyengine#2190, introduced in bevyengine#2112. Tested by changing materials in the the `3d_scene` example to be unlit. Unsure how to prevent future regressions without creating a test case scene that will catch these runtime panics.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes the frag shader for unlit materials by correcting the scope of the
#ifndefto include the light functions. Closes #2190, introduced in #2112.Tested by changing materials in the the
3d_sceneexample to be unlit. Unsure how to prevent future regressions without creating a test case scene that will catch these runtime panics.