Fix comments and indentation in .gdshaderinc files
#79158
Merged
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
Fixes godotengine#78205 The handling of comments and indentation in the shader editor wasn't considering shader include files.
akien-mga
added
the
cherrypick:4.1
akien-mga
approved these changes
Jul 7, 2023
|
Thanks! |
YuriSizov
removed
the
cherrypick:4.1
|
Cherry-picked for 4.1.1. |
akien-mga
changed the title
.gdshaderinc files
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 #78205
The handling of comments and indentation in the shader editor wasn't considering shader include files.
It was using a
shader.is_null()call to check if a shader file was empty before doing the comments/indentation, but, when using a shader include file, theshaderproperty will benulleven when the file isn't empty, and that would cause an early exit from the comments/indentation handling.Testing: