[2057] - Fix views/display submenus in OCIODisplay app#2068
Merged
doug-walker merged 4 commits intoDec 7, 2024
Merged
Conversation
doug-walker
requested changes
Oct 11, 2024
Collaborator
doug-walker
left a comment
doug-walker
left a comment
There was a problem hiding this comment.
Thanks for this contribution Hannah!
Apologies for the delayed review, things have been very busy. Just one minor request below.
Minor issue, but I'm noticing a large number of white space changes. Not sure if that was you or you have an auto-formatter turned on. Although the changes are not bad, we generally don't like people to reformat white space in areas of the code they are not modifying. It makes the PR more difficult to review and it makes the git blame history of the file harder to follow. I won't ask you to waste your time reverting the changes, but please keep it in mind for future contributions.
Collaborator
|
@hannahmkrasnick , we would like to merge this in time for the OCIO 2.4.1 release around Dec. 9. Have you been able to make progress on getting the CLA signed? |
Contributor
Author
Hey @doug-walker ! I've been added to the approval list, and I tried to update that here. Let me know if you need anything else from me! |
Signed-off-by: Hannah <hannah.mk23@gmail.com>
Signed-off-by: Hannah <hannah.mk23@gmail.com>
hannahmkrasnick
force-pushed
the
bug-fix/fix_ociodisplay_view_menu
branch
from
fe74f08 to
f886de0
Compare
doug-walker
approved these changes
Dec 7, 2024
Collaborator
doug-walker
left a comment
doug-walker
left a comment
There was a problem hiding this comment.
This is very helpful, Hannah! Thanks for getting the CLA signed, we will include this in OCIO 2.4.1.
cozdas
approved these changes
Dec 7, 2024
doug-walker
added a commit
to autodesk-forks/OpenColorIO
that referenced
this pull request
Dec 12, 2024
…reFoundation#2068) * fix views/display submenus Signed-off-by: Hannah <hannah.mk23@gmail.com> * fix global variable name Signed-off-by: Hannah <hannah.mk23@gmail.com> --------- Signed-off-by: Hannah <hannah.mk23@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 5c2fa57) Signed-off-by: Doug Walker <doug.walker@autodesk.com>
doug-walker
added a commit
that referenced
this pull request
Dec 12, 2024
* Match ACES 2.0 shader resource suffix format to regular luts. (#2077) Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com> (cherry picked from commit 59d6a86) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Build: enable parallel source file compilation on MSVC (#2072) By default Visual Studio projects do not compile source files in parallel. Add "/MP" flag to enable that. From scratch OCIO build on Ryzen 5950X, VS2022: 580sec -> 208sec. Most of remaining single-threaded time is cloning external libraries or building external libraries (most of them don't do parallel compilation either). But within building OCIO itself, CPU usage goes close to 100% instead of 5%. Signed-off-by: Aras Pranckevicius <aras@nesnausk.org> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 707734d) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Move GPU LUT files into the tests dir (#2069) Instead of creating temporary LUT files for GPU tests, read them from the testdata directory instead. This removes the need to clean them up after each run. Signed-off-by: Ananth Bhaskararaman <ananth.b@qubecinema.com> (cherry picked from commit b3900df) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Photoshop now supports OCIO (#2084) * ocio gm in photoshop Signed-off-by: Dave Sawyer <kingsawyer@gmail.com> * Update supported_apps.yml Signed-off-by: Dave Sawyer <kingsawyer@gmail.com> * ps and fnordware text Signed-off-by: Dave Sawyer <kingsawyer@gmail.com> --------- Signed-off-by: Dave Sawyer <kingsawyer@gmail.com> (cherry picked from commit 81c07fd) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Update doc building instructions (#2085) * Update doc building instructions Signed-off-by: Craig Zerouni <czerouni@gmail.com> * Remove stray comment line Signed-off-by: Craig Zerouni <czerouni@gmail.com> --------- Signed-off-by: Craig Zerouni <czerouni@gmail.com> (cherry picked from commit 800efd8) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * add Disguise to list of supported applications (#2088) Signed-off-by: Chris Nash <chris.nash@disguise.one> Co-authored-by: zachlewis <zachlewis@users.noreply.github.com> (cherry picked from commit 9bc5b8e) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Add `DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR` builtin transform. (#2095) (cherry picked from commit f37ca55) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Fix broken Linux and Mac CI workflow (#2102) * Fix broken Linux and Mac CI workflow Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Update job name Signed-off-by: Doug Walker <doug.walker@autodesk.com> --------- Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit c7ad2a9) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Text format (e.g. IridasCube) parsing optimizations (#2074) * Iridas .cube and other text format parsing optimizations Primarily driven by a wish to increase performance of parsing .cube files. But the functions that are added or changed are used across parsing of all/most of text based formats. With these changes, parsing "Khronos PBR Neutral" .cube file (5.4MB) on Ryzen 5950X / VS2022 Release build: 167ms -> 123ms. - Add locale independent IsSpace(char). Somewhat similar to 3aab90d, whitespace trimming perhaps should not be locale dependent. - Add IsEmptyOrWhiteSpace() and use that inside ParseUtils::nextline, instead of doing Trim(line).empty(). - Add StringUtils::StartsWith(char) and use that in various parsers that were constructing whole std::string object just to check for a single character. - When building for C++17 or later, NumberUtils can use standard <charconv> from_chars functions (except on Apple platforms, where those are not implemented for floating point types as of Xcode 15). This has advantage of not having to deal with errno or locales. Saves some thread local storage accesses and function calls (e.g. on Windows errno is actually a function call). - There's a CMake setup change that adds /Zc:__cplusplus flag for MSVC; for backwards compat reasons it does not report proper C++ version detection defines otherwise. Signed-off-by: Aras Pranckevicius <aras@nesnausk.org> * Fix test failures (char can be signed, doh) Signed-off-by: Aras Pranckevicius <aras@nesnausk.org> * Tests: add unit test coverage for NumberUtils::from_chars directly Currently it was only tested indirectly via XMLReaderUtils_tests and file format tests Signed-off-by: Aras Pranckevicius <aras@nesnausk.org> * Fix from_chars in C++17 code path to understand hex prefix (0x) and skip optional whitespace To match the pre-C++17 behavior that was there before Signed-off-by: Aras Pranckevicius <aras@nesnausk.org> * Fix detection of <charconv> float from_chars availability Signed-off-by: Aras Pranckevicius <aras@nesnausk.org> * Tests: Fix missing <limits> include for gcc Signed-off-by: Aras Pranckevicius <aras@nesnausk.org> * Tests: fix uninitialized variable warning-as-error on gcc Signed-off-by: Aras Pranckevicius <aras@nesnausk.org> --------- Signed-off-by: Aras Pranckevicius <aras@nesnausk.org> Co-authored-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit f2dc147) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * [2057] - Fix views/display submenus in OCIODisplay app (#2068) * fix views/display submenus Signed-off-by: Hannah <hannah.mk23@gmail.com> * fix global variable name Signed-off-by: Hannah <hannah.mk23@gmail.com> --------- Signed-off-by: Hannah <hannah.mk23@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 5c2fa57) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Fix bit-depth attr for inv luts for CTF writing (#2090) Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit dafefe6) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Fixed range function error in nuke colorlookup examples (#2096) * Error found: ocio_to_colorlookup_all.py Signed-off-by: Seif Ashraf <seifibrahim32@GMail.com> * Update colorlookup_to_spi1d.py Signed-off-by: Seif Ashraf <seifibrahim32@GMail.com> * Update ocio_to_colorlookup_rgb.py Signed-off-by: Seif Ashraf <seifibrahim32@GMail.com> --------- Signed-off-by: Seif Ashraf <seifibrahim32@GMail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 0f06f04) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Replaced DX11 HLSL shading language with the more accurate shading model 5.0 (SM_5_0). (#2078) Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 3132579) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Adsk Contrib - Optimizer should detect pair inverses before combining multiple op pairs (#2104) * Fix opt combine issue Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Improve gamma test Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Add check for DisplayP3-HDR built-in Signed-off-by: Doug Walker <doug.walker@autodesk.com> --------- Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 1890b7d) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Fix Python wheel macOS workflow and make OCIO_PYTHON_LOAD_DLLS_FROM_PATH opt-in (#2106) Signed-off-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 6fa40a4) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Increment library version to 2.4.1 Signed-off-by: Doug Walker <doug.walker@autodesk.com> --------- Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com> Signed-off-by: Doug Walker <doug.walker@autodesk.com> Signed-off-by: Aras Pranckevicius <aras@nesnausk.org> Signed-off-by: Ananth Bhaskararaman <ananth.b@qubecinema.com> Signed-off-by: Dave Sawyer <kingsawyer@gmail.com> Signed-off-by: Craig Zerouni <czerouni@gmail.com> Signed-off-by: Chris Nash <chris.nash@disguise.one> Signed-off-by: Hannah <hannah.mk23@gmail.com> Signed-off-by: Seif Ashraf <seifibrahim32@GMail.com> Signed-off-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: Éric Renaud-Houde <eric.renaud.houde@gmail.com> Co-authored-by: Aras Pranckevičius <aras@nesnausk.org> Co-authored-by: Ananth <srv+gh@kedi.dev> Co-authored-by: Dave Sawyer <kingsawyer@gmail.com> Co-authored-by: Craig Zerouni <czerouni@gmail.com> Co-authored-by: Chris Nash <chris.nash@disguise.one> Co-authored-by: zachlewis <zachlewis@users.noreply.github.com> Co-authored-by: Thomas Mansencal <thomas.mansencal@gmail.com> Co-authored-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: hannahmkrasnick <81137034+hannahmkrasnick@users.noreply.github.com> Co-authored-by: Seif Ashraf <seifibrahim32@GMail.com>
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 fixes the bug where the "Views" submenu (renamed from "Transform") doesn't update when a new "Display" is chosen (renamed submenu from "Device").
#2057