fix: SG-43607: Bugfix/aces2 support#1288
Merged
bernie-laberge merged 2 commits intoJul 6, 2026
Merged
Conversation
Signed-off-by: TJ Jackson <tj.jackson@dreamworks.com>
tjjackson
requested review from
bernie-laberge,
cedrik-fuoco-adsk and
eloisebrosseau
as code owners
markreidvfx
reviewed
Jun 2, 2026
bernie-laberge
changed the title
bernie-laberge
added
PR: Acknowledged
bernie-laberge
added
PR: In Progress
1 task
Contributor
|
Note that I was able to reproduce this issue with a standard config so I created an issue with the repro steps in it for QA: |
Signed-off-by: TJ Jackson <tj.jackson@dreamworks.com>
bernie-laberge
approved these changes
Jul 6, 2026
bernie-laberge
left a comment
bernie-laberge
left a comment
Contributor
There was a problem hiding this comment.
Thank you @tjjackson !
eloisebrosseau
approved these changes
Jul 6, 2026
bernie-laberge
merged commit f702cd9
into
AcademySoftwareFoundation:main
17 checks passed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Linked issues
#1275 #1330
Summarize your change.
Added a check to functionsMissingLutAsParameter() to avoid treating "else if" as a function definition.
Describe the reason for the change.
The logic added in my previous PR uses a regex to search for the start of functions. The regex roughly follows the format of "word word (...) {".
"else if (...) {" matches as a false positive, so if there is an "else if" block that references a LUT, the code will treat all insteads of "if (...)" as a function call that needs the LUT added as a parameter, and breaks the code.
To the best of my knowledge, "else if" may be the only combination of GLSL keywords that could match the regex as a false positive, so I just added logic to check if the first word matched is "else".
Describe what you have tested and on which operating system.
Tested it on Rocky Linux 9.7