Merge branch 'RB-10.6' into 10.5_forward_merge_10.6

Author: lucienfostier

.github/workflows/main.yml

@@ -44,7 +44,7 @@ jobs:
             buildType: RELEASE
             containerImage: ghcr.io/gafferhq/build/build:3.0.0
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-linux-gcc11.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-linux-gcc11.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: true
             jobs: 4
@@ -54,7 +54,7 @@ jobs:
             buildType: DEBUG
             containerImage: ghcr.io/gafferhq/build/build:3.0.0
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-linux-gcc11.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-linux-gcc11.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: false
             jobs: 4
@@ -63,7 +63,7 @@ jobs:
             os: windows-2022
             buildType: RELEASE
             options: .github/workflows/main/options.windows
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-windows.zip
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-windows.zip
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: true
             jobs: 4
@@ -72,7 +72,7 @@ jobs:
             os: windows-2022
             buildType: RELWITHDEBINFO
             options: .github/workflows/main/options.windows
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-windows.zip
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-windows.zip
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: false
             jobs: 4
@@ -81,7 +81,7 @@ jobs:
             os: macos-14
             buildType: RELEASE
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-macos-arm64.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-macos-arm64.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: true
             jobs: 3
@@ -92,11 +92,18 @@ jobs:
 
     steps:
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-    - uses: ilammy/[email protected]
+    - name: Install Windows SDK
+      run: |
+        curl.exe -L --output winsdksetup.exe --url https://download.microsoft.com/download/9/7/9/97982c1d-d687-41be-9dd3-6d01e52ceb68/windowssdk/winsdksetup.exe
+        Start-Process ./winsdksetup.exe -ArgumentList "/Features OptionId.DesktopCPPx64 /Quiet /NoRestart" -NoNewWindow -Wait
+      shell: pwsh
+      if: runner.os == 'Windows'
+
+    - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
       with:
-        sdk: 10.0.17763.0
+        sdk: 10.0.20348.0
 
     - name: Install toolchain (Windows)
       run: |
@@ -151,7 +158,7 @@ jobs:
       shell: bash
 
     - name: Cache
-      uses: actions/cache@v4
+      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
         path: sconsCache
         key: ${{ runner.os }}-${{ matrix.containerImage }}-${{env.CORTEX_DEPENDENCIES_HASH}}-${{ matrix.buildType }}-${{ github.sha }}
@@ -169,7 +176,6 @@ jobs:
       run: |
         scons ${{ matrix.tests }} BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} BUILD_CACHEDIR=sconsCache
       env:
-        IECORE_RTLD_GLOBAL: 0
         OCIO: ${{ env.CORTEX_BUILD_NAME }}/openColorIO/config.ocio
 
     - name: Build Package
@@ -178,7 +184,7 @@ jobs:
        ${{ env.PACKAGE_COMMAND }} ${{ env.CORTEX_BUILD_NAME }}.${{env.PACKAGE_EXTENSION}} ${{ env.CORTEX_BUILD_NAME }}
       if: matrix.publish
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: ${{ env.CORTEX_BUILD_NAME }}
         path: ${{ env.CORTEX_BUILD_NAME }}.${{ env.PACKAGE_EXTENSION }}

.github/workflows/main/options.posix

@@ -19,7 +19,7 @@ LIBPATH = libs
 
 PYTHON = deps + "/bin/python"
 
-pythonABIVersion = "3.10"
+pythonABIVersion = "3.11"
 
 PYTHON_LINK_FLAGS = "-lpython" + pythonABIVersion
 
@@ -59,8 +59,9 @@ USD_LIB_PREFIX = "usd_"
 # Environment
 # ===========
 
-ENV_VARS_TO_IMPORT = "PATH CI IECORE_RTLD_GLOBAL"
+ENV_VARS_TO_IMPORT = "PATH CI"
 
 if platform.system() == "Darwin" :
 	os.environ["DYLD_FRAMEWORK_PATH"] = libs
-	ENV_VARS_TO_IMPORT += " DYLD_FRAMEWORK_PATH"
+	os.environ["PYTHONHOME"] = libs + "/Python.framework/Versions/" + pythonABIVersion
+	ENV_VARS_TO_IMPORT += " DYLD_FRAMEWORK_PATH PYTHONHOME"

.github/workflows/main/options.windows

@@ -47,10 +47,6 @@ USD_LIB_PATH = libs
 USD_LIB_PREFIX = "usd_"
 DOXYGEN = deps + "\\doxygen\\doxygen.exe"
 
-# DCC Integrations
-# ================
-NUKE_ROOT = ""
-
 # Environment
 # ===========
 

.gitignore

@@ -28,7 +28,6 @@ plugins
 lib
 build
 config.log
-mayaLog
 projects
 test/IECore/IECoreTest
 test/*/results*.txt

Changes

@@ -1,6 +1,58 @@
-10.5.x.x (relative to 10.5.15.4)
+10.6.x.x (relative to 10.6.0.1)
+========
+
+
+
+10.6.0.1 (relative to 10.6.0.0)
 ========
 
+Fixes
+-----
+
+- USDScene : Worked around numerical imprecision when converting between time and UsdTimeCode.
+
+Build
+-----
+
+- CI : Updated to GafferHQ/dependencies 10.0.0.
+
+10.6.0.0 (relative to 10.5.15.2)
+========
+
+Improvements
+------------
+
+- RefCounted, RunTimeTyped : Inlined constructor and destructor.
+
+Fixes
+-----
+
+- USDScene :
+  - Fixed writing of shutter values from cameras without a `shutter` parameter. The `shutter:open` and `shutter:close` attributes are now omitted instead of being written with Cortex's default -0.5, 0.5 shutter values.
+  - Fixed reading of shutter values from cameras without `shutter:open` and `shutter:close` attributes. The `shutter` parameter is now omitted instead of being created with USD's default 0, 0 shutter values.
+- CurvesPrimitiveEvaluator : Fixed error in `Result::vTangent()` function causing tangent to point in opposite direction for curves with `Linear` interpolation.
+
+Breaking Changes
+----------------
+
+- Renderable : Removed `render()` method.
+- CoordinateSystem : Removed transform.
+- Font : Removed `meshGroup()` method.
+- Options, Group, Transform, MatrixTransform, MatrixMotionTransform, AttributeState, Light, MotionPrimitive : Removed.
+- CurveExtrudeOp, IDXReader : Removed.
+- PreWorldRenderable, StateRenderable : Removed. All derived classes now derive directly from Renderable.
+- Renderer, AttributeBlock, EditBlock, MotionBlock, TransformBlock, WorldBlock : Removed.
+- IECoreHoudini : Removed.
+- IECoreMaya : Removed.
+- IECoreNuke : Removed.
+- Removed support for `IECORE_RTLD_GLOBAL` environment variable.
+- SmoothSkinningData : Removed, along with all associated Ops and Parameters.
+
+10.5.x.x (relative to 10.5.15.4)
+=======
+
+
+
 10.5.15.4 (relative to 10.5.15.3)
 ========
 

README.md

@@ -3,9 +3,7 @@
 
 # Cortex #
 
-Cortex is a cross-application framework for computation, rendering, and file I/O that provides a set of high-quality C++ libraries and Python modules tailored for software development in the VFX industry. This project focuses on creating a set of practical and reusable modules for technical directors, CG supervisors, and programmers, freeing them to focus on innovation and new features in their software projects.
-
-Out of the box, Cortex has full support for the [Arnold](https://www.arnoldrenderer.com/arnold/) and [3Delight](https://www.3delight.com) renderers. It also has built-in integration with Maya, Houdini, and Nuke, with default user interfaces that provide for file I/O and live data manipulation. With its extensible API, Cortex’s DCC integration can be expanded to create custom tools to solve studio pipeline needs.
+Cortex is a framework for computation, rendering, and file I/O that provides a set of high-quality C++ libraries and Python modules tailored for software development in the VFX industry. This project focuses on creating a set of practical and reusable modules for technical directors, CG supervisors, and programmers, freeing them to focus on innovation and new features in their software projects.
 
 You can find out more from our [introductory paper on Cortex](https://github.com/ImageEngine/cortex/wiki/pdfs/AnOpenSourceFrameworkForVisualEffectsSoftwareDevelopment.pdf) and the [Cortex presentations at SIGGRAPH 2011](https://vimeo.com/album/5504655).