Merge branch 'main' into add_GenSlang_SlangRenderer_RenderSlang

Author: jstone-lucasfilm

CMakeLists.txt

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

documents/Specification/MaterialX.PBRSpec.md

@@ -388,8 +388,8 @@ Note that the standard library includes definitions for [**`displacement`**](./M
 * **`artistic_ior`**: Converts the artistic parameterization reflectivity and edge_color to complex IOR values. To be used with the [<conductor_bsdf>](#node-conductor-bsdf) node.
     * `reflectivity` (color3): Reflectivity per color component at facing angles. Defaults to (0.947, 0.776, 0.371).
     * `edge_color` (color3): Reflectivity per color component at grazing angles. Defaults to (1.0, 0.982, 0.753).
-    * `ior` (**output**, vector3): Computed index of refraction.
-    * `extinction` (**output**, vector3): Computed extinction coefficient.
+    * `ior` (**output**, color3): Computed index of refraction.
+    * `extinction` (**output**, color3): Computed extinction coefficient.
 
 <a id="node-chiang-hair-roughness"> </a>
 

javascript/MaterialXTest/package-lock.json

@@ -16,17 +16,17 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@babel/core": "^7.28.0",
-    "@babel/preset-env": "^7.28.0",
-    "@babel/register": "^7.27.1",
-    "chai": "^4.5.0",
-    "copyfiles": "^2.4.1",
-    "karma": "^6.4.4",
-    "karma-chai": "^0.1.0",
-    "karma-chrome-launcher": "^3.2.0",
-    "karma-mocha": "^2.0.1",
-    "karma-mocha-reporter": "^2.2.5",
-    "mocha": "^10.8.2",
-    "rimraf": "^3.0.2"
+    "@babel/core": "7.28.0",
+    "@babel/preset-env": "7.28.0",
+    "@babel/register": "7.27.1",
+    "chai": "4.5.0",
+    "copyfiles": "2.4.1",
+    "karma": "6.4.4",
+    "karma-chai": "0.1.0",
+    "karma-chrome-launcher": "3.2.0",
+    "karma-mocha": "2.0.1",
+    "karma-mocha-reporter": "2.2.5",
+    "mocha": "10.2.0",
+    "rimraf": "3.0.2"
   }
 }