Adsk Contrib - Add 2.6.0 built-in configs - #2353
Merged
doug-walker merged 4 commits intoSep 30, 2026
Merged
doug-walker merged 4 commits into
doug-walker merged 4 commits into
Conversation
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
carolalynn
approved these changes
Sep 28, 2026
carolalynn
left a comment
carolalynn
left a comment
Collaborator
There was a problem hiding this comment.
Took a look and all seems well other than the couple changes you note needed for merge. Thanks Doug!
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
Signed-off-by: Doug Walker <doug.walker@autodesk.com> # Conflicts: # docs/releases/ocio_2_6.rst
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
doug-walker
merged commit Sep 30, 2026
a537b13
into
AcademySoftwareFoundation:main
39 of 43 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.
This PR adds the built-in OCIO Studio and CG configs for ACES based on the TSC requests for the 2.6.0 release.
Please see this config generator PR for the description of the new contents.
Note that this PR requires PR #2341 (display aliases) to be merged before this one. As a result I made a temporary edit in ConfigUtils.cpp to use an earlier built-in config so that the tests pass. That will be reverted when I update this branch.
Assisted by: Claude Code / Sonnet 5