Backport Uncomment adding backslashes to HYBRID_V1_CUSTOM_ADDITIONAL_MATERIAL_VARS generation #1596
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
…VARS generation, to fix Hybrid V1 not working with multiple properties.
|
It appears that you made a non-draft PR! |
stramit
approved these changes
Aug 13, 2020
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.
Backport of #1586
Commit ee59f50 in PR #7 commented out the code that adds backslashes to the generated HYBRID_V1_CUSTOM_ADDITIONAL_MATERIAL_VARS macro when Hybrid Renderer V1 is used.
The backslashes are necessary for Hybrid V1 to work correctly when multiple DOTS instanced properties are used. The macro is intended to expand into multiple UNITY_DEFINE_INSTANCED_PROP definitions, which are split across multiple lines and concatenated together using the preprocessor backslash operator. Without the backslash, any UNITY_DEFINE_INSTANCED_PROP definitions after the first are expanded immediately instead, which causes a compile error.
This PR restores the backslashes and adds a comment to explain why it's necessary.