[ShaderGraph] [bugfix 1264932] "Properly" handle null textures in preview #1702
Conversation
This file contains 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
elizabeth-legros
approved these changes
Aug 28, 2020
works exactly the same, but might as well make it match
|
Yamato is all green, except OSX Metal, which is failing on trunk as well. |
ghost
removed
the
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.
Purpose of this PR
Fixes bug https://fogbugz.unity3d.com/f/cases/1264932/
Null textures were not updated by the preview code.
Turns out it is kind of impossible to revert a Material or MaterialPropertyBlock back to the "null" state.
So instead we set the texture to the known default (luckily all ShaderGraph textures default to "white").
Testing status
Manual Tests: What did you do?
Tested ShaderGraph in editor with Texture2D properties and inline assets, Cubemap properties and inline assets; setting values to textures, then none and back.
Tested initial state is correct on graph load.
Tested setting null or texture using undo/redo works properly.
Yamato: (Select your branch):
https://yamato.prd.cds.internal.unity3d.com/jobs/902-Graphics/tree/sg%252Ffix%252F1264932
Any test projects to go with this to help reviewers?
Comments to reviewers
Notes for the reviewers you have assigned.