Merge branch 'dev_1.39' into add_integer_conditional_nodes

AcademySoftwareFoundation · Apr 26, 2024 · 7642c2a · 7642c2a
2 parents a60f499 + ba1cd47
commit 7642c2a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -382,7 +382,7 @@ jobs:
       fail-fast: false
       matrix:
         python-minor: ['7', '8', '9', '10', '11']
-        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
+        os: ['ubuntu-latest', 'windows-latest', 'macos-13']
 
     steps:
     - name: Sync Repository
@@ -400,7 +400,7 @@ jobs:
         path: sdist
 
     - name: Build Wheel
-      uses: pypa/cibuildwheel@v2.16.5
+      uses: pypa/cibuildwheel@v2.17.0
       with:
         package-dir: ${{ github.workspace }}/sdist/${{ needs.sdist.outputs.sdist_filename }}
       env:
@@ -411,7 +411,6 @@ jobs:
         # manylinux2014 is CentOS 7 based. Which means GCC 10 and glibc 2.17.
         CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
         CIBW_BEFORE_ALL_LINUX: yum install -y libXt-devel
-        CIBW_BEFORE_ALL_MACOS: sudo xcode-select -switch /Applications/Xcode_13.4.app
         CIBW_BUILD_VERBOSITY: 1
         CIBW_ENVIRONMENT: CMAKE_BUILD_PARALLEL_LEVEL=2
         # CIBW_BUILD_FRONTEND: build  # https://github.com/pypa/build

diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
@@ -4588,15 +4588,15 @@
     <input name="in2" type="vector3" value="0.0, 1.0, 0.0" />
     <input name="in3" type="vector3" value="0.0, 0.0, 1.0" />
     <input name="in4" type="vector3" value="0.0, 0.0, 0.0" />
-    <output name="out" type="matrix44" default="1.0, 0.0, 0.0, 0.0,  0.0, 1.0, 0.0, 0.0,  0.0, 0.0, 1.0, 0.0,  1.0, 0.0, 0.0, 0.0" />
+    <output name="out" type="matrix44" default="1.0, 0.0, 0.0, 0.0,  0.0, 1.0, 0.0, 0.0,  0.0, 0.0, 1.0, 0.0,  0.0, 0.0, 0.0, 1.0" />
   </nodedef>
 
   <nodedef name="ND_creatematrix_vector4_matrix44" node="creatematrix" nodegroup="math">
     <input name="in1" type="vector4" value="1.0, 0.0, 0.0, 0.0" />
     <input name="in2" type="vector4" value="0.0, 1.0, 0.0, 0.0" />
     <input name="in3" type="vector4" value="0.0, 0.0, 1.0, 0.0" />
     <input name="in4" type="vector4" value="0.0, 0.0, 0.0, 1.0" />
-    <output name="out" type="matrix44" default="1.0, 0.0, 0.0, 0.0,  0.0, 1.0, 0.0, 0.0,  0.0, 0.0, 1.0, 0.0,  1.0, 0.0, 0.0, 0.0" />
+    <output name="out" type="matrix44" default="1.0, 0.0, 0.0, 0.0,  0.0, 1.0, 0.0, 0.0,  0.0, 0.0, 1.0, 0.0,  0.0, 0.0, 0.0, 1.0" />
   </nodedef>
 
   <!--