Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integrate main into RB-2.3 branch and update library version #1918

Merged
merged 26 commits into from
Dec 8, 2023
Merged

Integrate main into RB-2.3 branch and update library version #1918

merged 26 commits into from
Dec 8, 2023

Commits on Dec 6, 2023

  1. Fix support for X86 32-bit (AcademySoftwareFoundation#1842) 

    Signed-off-by: Mark Reid <[email protected]>
(cherry picked from commit 16b3157)
Signed-off-by: Doug Walker <[email protected]>
    @markreidvfx @doug-walker
    markreidvfx authored and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    2913e26 View commit details
    Browse the repository at this point in the history

  2. Add some small arm neon optimizations (AcademySoftwareFoundation#1847) 

    * Remove unused includes

Signed-off-by: Mark Reid <[email protected]>

* Use neon hardware support for f16 conversions

Signed-off-by: Mark Reid <[email protected]>

* Add some small neon optimizations
use blendv,floor and fma intrinsics were possible

Signed-off-by: Mark Reid <[email protected]>

---------

Signed-off-by: Mark Reid <[email protected]>
(cherry picked from commit 14f0afa)
Signed-off-by: Doug Walker <[email protected]>
    @markreidvfx @doug-walker
    markreidvfx authored and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    88e7ebb View commit details
    Browse the repository at this point in the history

  3. Add links to new release notes documentation (AcademySoftwareFoundati… 

    …on#1848)

Signed-off-by: Kevin Wheatley <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 87126fa)
Signed-off-by: Doug Walker <[email protected]>
    @KevinJW @doug-walker
    KevinJW and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    a91cb93 View commit details
    Browse the repository at this point in the history

  4. Changing version to 2.4.0 (AcademySoftwareFoundation#1852) 

    Signed-off-by: Cédrik Fuoco <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 381d1fc)
Signed-off-by: Doug Walker <[email protected]>
    @cedrik-fuoco-adsk @doug-walker
    cedrik-fuoco-adsk and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    19133ba View commit details
    Browse the repository at this point in the history

  5. Correctly recover CXX_FLAGS in CheckSupportSSE2.cmake (AcademySoftwar… 

    …eFoundation#1861)

Signed-off-by: Chongyun Lee <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit c429400)
Signed-off-by: Doug Walker <[email protected]>
    @licy183 @doug-walker
    licy183 and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    bbcfab6 View commit details
    Browse the repository at this point in the history

  6. Fix regression in cccid handling when no value is supplied (AcademySo… 

    …ftwareFoundation#1855)

In v1 of OCIO FileTransforms are able to load .cc files
without specifying a cccid. In v2 this broke causing an
exception to be raised instead of using the first cc found
in the file.

Signed-off-by: Kevin Wheatley <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit c7ad353)
Signed-off-by: Doug Walker <[email protected]>
    @KevinJW @doug-walker
    KevinJW and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    bc60158 View commit details
    Browse the repository at this point in the history

  7. Fix missing cache id reset on look update. (AcademySoftwareFoundation… 

    …#1873)

Signed-off-by: Eric Renaud-Houde <[email protected]>
(cherry picked from commit dddbee0)
Signed-off-by: Doug Walker <[email protected]>
    @num3ric @doug-walker
    num3ric authored and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    6e2c719 View commit details
    Browse the repository at this point in the history

  8. ocioview: Curve Inspector improvements (AcademySoftwareFoundation#1845) 

    * Curve inspector improvements

- Move README to root app folder
- Change curve inspector grid to always render as a square with 10 segments.
- Add transform init callback to set new transform subscriptions to the current viewer if set to passthrough.

Signed-off-by: Michael Dolan <[email protected]>

* Improve log range calculation

Signed-off-by: Michael Dolan <[email protected]>

* Improve channel sample comparison

Signed-off-by: Michael Dolan <[email protected]>

* Update src/apps/ocioview/ocioview/inspect/curve_inspector.py

Signed-off-by: Michael Dolan <[email protected]>

Co-authored-by: Doug Walker <[email protected]>
Signed-off-by: Michael Dolan <[email protected]>

---------

Signed-off-by: Michael Dolan <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 8add374)
Signed-off-by: Doug Walker <[email protected]>
    @michdolan @doug-walker
    michdolan and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    df70d6a View commit details
    Browse the repository at this point in the history

  9. Fix missing Default View Transform on equal operator (AcademySoftware… 

    …Foundation#1886)

Add the missing assignment of the the default view transform when a config is copied using the equal operator

Signed-off-by: Michael De Caria <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit bc8569b)
Signed-off-by: Doug Walker <[email protected]>
    @mdecaria @doug-walker
    mdecaria and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    81518a9 View commit details
    Browse the repository at this point in the history

  10. Remove circular import caused by typing annotations. (AcademySoftware… 

    …Foundation#1882)

Signed-off-by: Thomas Mansencal <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 1fad466)
Signed-off-by: Doug Walker <[email protected]>
    @KelSolaar @doug-walker
    KelSolaar and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    8db3b2a View commit details
    Browse the repository at this point in the history

  11. fix(grammatical): Spelling mistakes (AcademySoftwareFoundation#1892) 

    Signed-off-by: AbhineshJha <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 0d00b2c)
Signed-off-by: Doug Walker <[email protected]>
    @AbhineshJha @doug-walker
    AbhineshJha and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    0840614 View commit details
    Browse the repository at this point in the history

  12. Improve ocioview mac support and simplify dependencies (AcademySoftwa… 

    …reFoundation#1853)

* PySide 6, remove imath, add imageio support

Signed-off-by: Rémi Achard <[email protected]>

Remove Imath

Signed-off-by: Rémi Achard <[email protected]>

Support imageio as fallback for openimageio

Signed-off-by: Rémi Achard <[email protected]>

Further adjustments following latest updates

Signed-off-by: Rémi Achard <[email protected]>

Fix pixel probe

Signed-off-by: Remi Achard <[email protected]>

Add OpenColorIO to requirements

Signed-off-by: Remi Achard <[email protected]>

* Fix rebase issue

Signed-off-by: Remi Achard <[email protected]>

---------

Signed-off-by: Remi Achard <[email protected]>
Signed-off-by: Thomas Mansencal <[email protected]>
Signed-off-by: Michael Dolan <[email protected]>
Co-authored-by: Thomas Mansencal <[email protected]>
Co-authored-by: Michael Dolan <[email protected]>
(cherry picked from commit 45544ce)
Signed-off-by: Doug Walker <[email protected]>
    @remia @KelSolaar
    @michdolan @doug-walker
    3 people authored and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    ffb2023 View commit details
    Browse the repository at this point in the history

  13. Issue AcademySoftwareFoundation#1874 Cast to unsigned char for isspac… 

    …e. (AcademySoftwareFoundation#1888)

* Issue AcademySoftwareFoundation#1874 Cast to unsigned char for isspace.

Signed-off-by: pylee <[email protected]>

* Add unit test.

Signed-off-by: pylee <[email protected]>

* Add test comment as suggested in code review.

Signed-off-by: pylee <[email protected]>

---------

Signed-off-by: pylee <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit ed85207)
Signed-off-by: Doug Walker <[email protected]>
    @pennelee @doug-walker
    pennelee and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    c827ecb View commit details
    Browse the repository at this point in the history

  14. Tentative fix for the doxygen installation in the CI (Windows) (Acade… 

    …mySoftwareFoundation#1890)

Signed-off-by: Cédrik Fuoco <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit b94a184)
Signed-off-by: Doug Walker <[email protected]>
    @cedrik-fuoco-adsk @doug-walker
    cedrik-fuoco-adsk and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    ff672ef View commit details
    Browse the repository at this point in the history

  15. Simplify the Findyaml-cpp module (AcademySoftwareFoundation#1891) 

    This fixes compatibility with yaml-cpp 0.8, which previously failed
because of a `get_property` call with the wrong target name.
I took the liberty to add a few simplifications along the way.

Signed-off-by: Tobias Mayer <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 1d3b695)
Signed-off-by: Doug Walker <[email protected]>
    @tobim @doug-walker
    tobim and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    f9d386c View commit details
    Browse the repository at this point in the history

  16. Skip processor concatenation if the display color space is also data. (… 

    …AcademySoftwareFoundation#1896)

* Skip processor concatenation if the display view transform is also data.

Signed-off-by: Eric Renaud-Houde <[email protected]>

* Moved missing display color space exception before processor creation.

Signed-off-by: Eric Renaud-Houde <[email protected]>

---------

Signed-off-by: Eric Renaud-Houde <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 52b4965)
Signed-off-by: Doug Walker <[email protected]>
    @num3ric @doug-walker
    num3ric and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    f42ba27 View commit details
    Browse the repository at this point in the history

  17. Restore GPU workflow and minor updates to CI (AcademySoftwareFoundati… 

    …on#1899)

* Restore GPU workflow runs

Signed-off-by: Rémi Achard <[email protected]>

* Enable undefined behaviour sanitizer

Signed-off-by: Rémi Achard <[email protected]>

* Fix SIMD option for platform_latest

Signed-off-by: Rémi Achard <[email protected]>

* Fix install_docs_env on CI workflow (not used at the moment)

Signed-off-by: Rémi Achard <[email protected]>

* Fix OpenEXR build flag

Signed-off-by: Rémi Achard <[email protected]>

---------

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 382dcb6)
Signed-off-by: Doug Walker <[email protected]>
    @remia @doug-walker
    remia and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    6c152bb View commit details
    Browse the repository at this point in the history

  18. Improve handling of pystring include dir (AcademySoftwareFoundation#1901 

    )

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 9078753)
Signed-off-by: Doug Walker <[email protected]>
    @remia @doug-walker
    remia and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    f948a7d View commit details
    Browse the repository at this point in the history

  19. Improve compatibility with minizip-ng COMPAT mode (AcademySoftwareFou… 

    …ndation#1902)

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit ffd0f70)
Signed-off-by: Doug Walker <[email protected]>
    @remia @doug-walker
    remia and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    bb7823c View commit details
    Browse the repository at this point in the history

  20. Fix NamedTransform context var issue (AcademySoftwareFoundation#1905) 

    Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit 4d64b32)
Signed-off-by: Doug Walker <[email protected]>
    @doug-walker
    doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    d5fd35a View commit details
    Browse the repository at this point in the history

  21. Fix env serialization for v1 configs (AcademySoftwareFoundation#1904) 

    Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit 4f4f30e)
Signed-off-by: Doug Walker <[email protected]>
    @doug-walker
    doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    b81b720 View commit details
    Browse the repository at this point in the history

  22. Fix yaml-cpp build issues (AcademySoftwareFoundation#1907) 

    Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 41441bb)
Signed-off-by: Doug Walker <[email protected]>
    @remia @doug-walker
    remia and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    872784c View commit details
    Browse the repository at this point in the history

  23. Adsk Contrib - Improve heuristics for finding known color spaces (Aca… 

    …demySoftwareFoundation#1913)

* Improve heuristics

Signed-off-by: Doug Walker <[email protected]>

* Add some comments

Signed-off-by: Doug Walker <[email protected]>

---------

Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit d8852b5)
Signed-off-by: Doug Walker <[email protected]>
    @doug-walker
    doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    3130f68 View commit details
    Browse the repository at this point in the history

  24. Add Python 3.12 wheels (AcademySoftwareFoundation#1898) 

    Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit f2cfec3)
Signed-off-by: Doug Walker <[email protected]>
    @remia @doug-walker
    remia and doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    29ef7f0 View commit details
    Browse the repository at this point in the history

  25. Increment library version to 2.3.1 

    Signed-off-by: Doug Walker <[email protected]>
    @doug-walker
    doug-walker committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    9241e83 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Fix wrong RPATH being injected into Python bindings DSO (AcademySoftw… 

    …areFoundation#1849)

Signed-off-by: Kevin Wheatley <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit ba2b41e)
Signed-off-by: Doug Walker <[email protected]>
    @KevinJW @doug-walker
    KevinJW and doug-walker committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    5c69922 View commit details
    Browse the repository at this point in the history