Merge branch 'main' into bugfix/1874_issspace_cast

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

CONTRIBUTING.md

@@ -243,7 +243,7 @@ expected to validate the behavior of every part of OCIO:
 * Any change to existing functionality should have tests added if they
   don't already exist.
 
-The test should should be run, via ``ctest``, before submitting a pull request.
+The test should be run, via ``ctest``, before submitting a pull request.
 
 ## Versioning Policy
 

README.md

@@ -38,7 +38,7 @@ Houdini, Silhouette FX, and
 [others](https://opencolorio.org/#supported_apps).
 
 OpenColorIO is free and open source software ([LICENSE](LICENSE)), and
-one of several projects actvively sponsored by the ASWF
+one of several projects actively sponsored by the ASWF
 ([Academy Software Foundation](https://www.aswf.io/)).
 
 OpenColorIO Project Mission
@@ -50,12 +50,12 @@ content creation applications and pipelines.
 
 OpenColorIO aims to:
 
-* be stable, secure, and thouroughly tested on Linux, macOS, and Windows
+* be stable, secure, and thoroughly tested on Linux, macOS, and Windows
 * be performant on modern CPUs and GPUs
 * be simple, scalable, and well documented
 * be compatible with critical color and imaging standards
 * provide lossless color processing wherever possible
-* maintain config backwards compatability across major versions
+* maintain config backwards compatibility across major versions
 * have every new feature carefully reviewed by leaders from the motion picture, 
   VFX, animation, and video game industries
 * have a healthy and active community
@@ -65,7 +65,7 @@ OpenColorIO Project Governance
 ------------------------------
 
 OpenColorIO is governed by the Academy Software Foundation (ASWF). See 
-[GOVERNANCE.md](GOVERNANCE.md) for detailed infomation about how the project 
+[GOVERNANCE.md](GOVERNANCE.md) for detailed information about how the project 
 operates.
 
 Web Resources

src/OpenColorIO/Config.cpp

@@ -435,7 +435,7 @@ class Config::Impl
             {
                 m_viewTransforms.push_back(vt->createEditableCopy());
             }
-
+            m_defaultViewTransform = rhs.m_defaultViewTransform;
             m_defaultLumaCoefs = rhs.m_defaultLumaCoefs;
             m_strictParsing = rhs.m_strictParsing;
 
@@ -4100,6 +4100,10 @@ void Config::addLook(const ConstLookRcPtr & look)
         if(StringUtils::Lower(getImpl()->m_looksList[i]->getName()) == namelower)
         {
             getImpl()->m_looksList[i] = look->createEditableCopy();
+
+            AutoMutex lock(getImpl()->m_cacheidMutex);
+            getImpl()->resetCacheIDs();
+
             return;
         }
     }

src/apps/ocioview/ocioview/README.md → src/apps/ocioview/README.md

@@ -41,10 +41,10 @@ Dependencies
 
 * PyOpenColorIO
 * [OpenImageIO (Python bindings)](https://github.com/OpenImageIO/oiio)
-* [Imath (Python bindings)](https://github.com/AcademySoftwareFoundation/Imath)
 * ``pip install -r requirements.txt``
   * [numpy](https://pypi.org/project/numpy/)
   * [Pygments](https://pypi.org/project/Pygments/)
   * [PyOpenGL](https://pypi.org/project/PyOpenGL/)
-  * [PySide2](https://pypi.org/project/PySide2/)
+  * [PySide6](https://pypi.org/project/PySide6/)
   * [QtAwesome](https://pypi.org/project/QtAwesome/)
+  * [imageio](https://pypi.org/project/imageio/)

src/apps/ocioview/main.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 
 import PyOpenColorIO as ocio
-from PySide2 import QtCore, QtWidgets, QtOpenGL
+from PySide6 import QtCore, QtGui, QtWidgets, QtOpenGL
 
 import ocioview.log_handlers  # Import to initialize logging
 from ocioview.main_window import OCIOView
@@ -30,12 +30,11 @@ def excepthook(exc_type, exc_value, exc_tb):
     sys.excepthook = excepthook
 
     # OpenGL core profile needed on macOS to access programmatic pipeline
-    gl_format = QtOpenGL.QGLFormat()
-    gl_format.setProfile(QtOpenGL.QGLFormat.CoreProfile)
-    gl_format.setSampleBuffers(True)
+    gl_format = QtGui.QSurfaceFormat()
+    gl_format.setProfile(QtGui.QSurfaceFormat.CoreProfile)
     gl_format.setSwapInterval(1)
     gl_format.setVersion(4, 0)
-    QtOpenGL.QGLFormat.setDefaultFormat(gl_format)
+    QtGui.QSurfaceFormat.setDefaultFormat(gl_format)
 
     # Create app
     app = QtWidgets.QApplication(sys.argv)

src/apps/ocioview/ocioview/config_dock.py

@@ -4,7 +4,7 @@
 from typing import Optional
 
 import PyOpenColorIO as ocio
-from PySide2 import QtCore, QtWidgets
+from PySide6 import QtCore, QtWidgets
 
 from .items import (
     ColorSpaceEdit,

src/apps/ocioview/ocioview/constants.py

@@ -3,7 +3,7 @@
 
 from pathlib import Path
 
-from PySide2 import QtCore, QtGui
+from PySide6 import QtCore, QtGui
 
 
 # Root application directory

src/apps/ocioview/ocioview/inspect/code_inspector.py

@@ -6,7 +6,7 @@
 
 import PyOpenColorIO as ocio
 from pygments.formatters import HtmlFormatter
-from PySide2 import QtCore, QtGui, QtWidgets
+from PySide6 import QtCore, QtGui, QtWidgets
 
 from ..message_router import MessageRouter
 from ..utils import get_glyph_icon, processor_to_shader_html
@@ -40,9 +40,9 @@ def __init__(self, parent: Optional[QtCore.QObject] = None):
 
         html_css = HtmlFormatter(style="material").get_style_defs()
         # Update line number colors to match palette
-        html_css = html_css.replace("#263238", palette.color(palette.Base).name())
+        html_css = html_css.replace("#263238", palette.color(palette.ColorRole.Base).name())
         html_css = html_css.replace(
-            "#37474F", palette.color(palette.Text).darker(150).name()
+            "#37474F", palette.color(palette.ColorRole.Text).darker(150).name()
         )
 
         # Widgets