Merge branch 'main' into pybind11_docs

Author: jstone-lucasfilm

.github/workflows/main.yml

@@ -2,11 +2,7 @@ name: main
 
 on:
   push:
-    paths-ignore:
-      - '**.md'
   pull_request:
-    paths-ignore:
-      - '**.md'
   schedule:
     # Nightly build
     - cron: '30 10 * * *'
@@ -30,17 +26,17 @@ jobs:
           python: 3.9
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON -DMATERIALX_BUILD_MONOLITHIC=ON
 
-        - name: Linux_GCC_14_Python312
+        - name: Linux_GCC_14_Python313
           os: ubuntu-24.04
           compiler: gcc
           compiler_version: "14"
-          python: 3.12
+          python: 3.13
 
-        - name: Linux_GCC_14_Python313
+        - name: Linux_GCC_14_Python314
           os: ubuntu-24.04
           compiler: gcc
           compiler_version: "14"
-          python: 3.13
+          python: 3.14
           test_render: ON
 
         - name: Linux_GCC_CoverageAnalysis
@@ -58,11 +54,11 @@ jobs:
           python: 3.9
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
 
-        - name: Linux_Clang_18_Python313
+        - name: Linux_Clang_18_Python314
           os: ubuntu-24.04
           compiler: clang
           compiler_version: "18"
-          python: 3.13
+          python: 3.14
           clang_format: ON
 
         - name: MacOS_Xcode_15_Python311
@@ -80,11 +76,11 @@ jobs:
           test_shaders: ON
           test_render: ON
 
-        - name: MacOS_Xcode_26_Python313
+        - name: MacOS_Xcode_26_Python314
           os: macos-26
           compiler: xcode
           compiler_version: "26.0"
-          python: 3.13
+          python: 3.14
           static_analysis: ON
           cmake_config: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DMATERIALX_BUILD_DATA_LIBRARY=ON
 
@@ -114,15 +110,21 @@ jobs:
           architecture: x64
           python: 3.13
           cmake_config: -G "Visual Studio 17 2022" -A "x64"
-          test_shaders: ON
           extended_build_mdl_sdk: ON
 
+        - name: Windows_VS2022_x64_Python314
+          os: windows-2025
+          architecture: x64
+          python: 3.14
+          cmake_config: -G "Visual Studio 17 2022" -A "x64"
+          test_shaders: ON
+          extended_build_oiio: ON
+
         - name: Windows_VS2022_x64_SharedLibs
           os: windows-2025
           architecture: x64
           python: None
           cmake_config: -G "Visual Studio 17 2022" -A "x64" -DMATERIALX_BUILD_SHARED_LIBS=ON
-          extended_build_oiio: ON
           upload_shaders: ON
 
     steps:
@@ -226,6 +228,7 @@ jobs:
       run: |
         python MaterialXTest/main.py
         python MaterialXTest/genshader.py
+        python Scripts/comparenodedefs.py
         python Scripts/creatematerial.py ../resources/Materials/Examples/StandardSurface/chess_set --texturePrefix chessboard --shadingModel standard_surface
         python Scripts/creatematerial.py ../resources/Materials/Examples/GltfPbr/boombox --shadingModel gltf_pbr
         python Scripts/mxformat.py ../resources/Materials/TestSuite/stdlib/upgrade --yes --upgrade

CMakeLists.txt

@@ -314,7 +314,7 @@ if(MSVC)
         add_compile_options(/WX)
     endif()
 else()
-    add_compile_options(-Wall -Wunused-parameter -Wno-missing-braces)
+    add_compile_options(-Wall -Wunused-parameter -Wshadow -Wno-missing-braces)
     if(MATERIALX_WARNINGS_AS_ERRORS)
         add_compile_options(-Werror)
     endif()

cmake/modules/MaterialXConfig.cmake.in

@@ -20,7 +20,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
 # MATERIALX_RESOURCES_DIR    Path to MaterialX Resources (sample data, mtlx etc)
 
 set_and_check(MATERIALX_BASE_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@")
-set_and_check(MATERIALX_STDLIB_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/libraries")
+set_and_check(MATERIALX_STDLIB_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/@MATERIALX_INSTALL_STDLIB_PATH@")
 if(@MATERIALX_BUILD_PYTHON@ AND @MATERIALX_INSTALL_PYTHON@)
     set_and_check(MATERIALX_PYTHON_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/python")
 endif()

documents/Specification/MaterialX.StandardNodes.md

@@ -1,4 +1,4 @@
 void mx_ramptb_float(float valuet, float valueb, vec2 texcoord, out float result)
 {
-    result = mix (valuet, valueb, clamp(texcoord.y, 0.0, 1.0) );
+    result = mix (valueb, valuet, clamp(texcoord.y, 0.0, 1.0) );
 }

libraries/stdlib/genglsl/mx_ramptb_float.glsl

@@ -1,4 +1,4 @@
 void mx_ramptb_vector2(vec2 valuet, vec2 valueb, vec2 texcoord, out vec2 result)
 {
-    result = mix (valuet, valueb, clamp(texcoord.y, 0.0, 1.0) );
+    result = mix (valueb, valuet, clamp(texcoord.y, 0.0, 1.0) );
 }

libraries/stdlib/genglsl/mx_ramptb_vector2.glsl

@@ -1,4 +1,4 @@
 void mx_ramptb_vector3(vec3 valuet, vec3 valueb, vec2 texcoord, out vec3 result)
 {
-    result = mix (valuet, valueb, clamp(texcoord.y, 0.0, 1.0) );
+    result = mix (valueb, valuet, clamp(texcoord.y, 0.0, 1.0) );
 }

libraries/stdlib/genglsl/mx_ramptb_vector3.glsl

@@ -1,4 +1,4 @@
 void mx_ramptb_vector4(vec4 valuet, vec4 valueb, vec2 texcoord, out vec4 result)
 {
-    result = mix (valuet, valueb, clamp(texcoord.y, 0.0, 1.0) );
+    result = mix (valueb, valuet, clamp(texcoord.y, 0.0, 1.0) );
 }

libraries/stdlib/genglsl/mx_ramptb_vector4.glsl

@@ -2,5 +2,5 @@
 
 void mx_splittb_float(float valuet, float valueb, float center, vec2 texcoord, out float result)
 {
-    result = mix(valuet, valueb, mx_aastep(center, texcoord.y));
+    result = mix(valueb, valuet, mx_aastep(center, texcoord.y));
 }

libraries/stdlib/genglsl/mx_splittb_float.glsl

@@ -2,5 +2,5 @@
 
 void mx_splittb_vector2(vec2 valuet, vec2 valueb, float center, vec2 texcoord, out vec2 result)
 {
-    result = mix(valuet, valueb, mx_aastep(center, texcoord.y));
+    result = mix(valueb, valuet, mx_aastep(center, texcoord.y));
 }