Merge branch 'dev_1.39' of https://github.com/AcademySoftwareFoundati…

…on/MaterialX into nodedef_creation_api
AcademySoftwareFoundation · Apr 9, 2024 · 083f2c5 · 083f2c5
2 parents e7ebe25 + d58302b
commit 083f2c5
Show file tree

Hide file tree

Showing 49 changed files with 1,275 additions and 1,093 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -63,14 +63,6 @@ jobs:
           test_render: ON
           clang_format: ON
 
-        - name: Linux_Clang_DynamicAnalysis
-          os: ubuntu-20.04
-          compiler: clang
-          compiler_version: "10"
-          python: None
-          cmake_config: -DMATERIALX_DYNAMIC_ANALYSIS=ON
-          dynamic_analysis: ON
-
         - name: MacOS_Xcode_13_Python37
           os: macos-12
           compiler: xcode
@@ -91,6 +83,14 @@ jobs:
           python: 3.12
           test_shaders: ON
 
+        - name: MacOS_Xcode_DynamicAnalysis
+          os: macos-14
+          compiler: xcode
+          compiler_version: "15.0"
+          python: None
+          dynamic_analysis: ON
+          cmake_config: -DMATERIALX_DYNAMIC_ANALYSIS=ON
+
         - name: iOS_Xcode_15
           os: macos-14
           compiler: xcode

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 ## [1.39.0] - Development
 
+## [1.38.10] - Development
+
+### Added
+
+- Added support for [environment light intensity](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1737) in generated GLSL shaders.
+
+### Changed
+
+- Removed an [extra suffix](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1744) from element names in texture baking.
+
+### Fixed
+
+- Move environment prefilter functions to their [referencing GLSL files](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1748), addressing shader compilation errors in USD.
+- Enable color and unit transforms on [root nodes](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1757) in shader generation, addressing missing color transforms in USD.
+- Store [document caches](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1753) in declaration order, addressing compiler-dependent behavior in nodedef lookups.
+- Use [framework linkage](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1752) for OpenGL in MacOS builds, addressing build issues in downstream projects.
+- Added a [missing vertex data prefix](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1762) in Vulkan GLSL shader generation.
+
 ## [1.38.9] - 2024-02-26
 
 ### Added

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -244,7 +244,7 @@ else()
         add_link_options(--coverage)
     endif()
     if(MATERIALX_DYNAMIC_ANALYSIS)
-        set(DYNAMIC_ANALYSIS_OPTIONS -fsanitize=address -fsanitize=leak -fsanitize=undefined -fno-sanitize-recover=all)
+        set(DYNAMIC_ANALYSIS_OPTIONS -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all)
         add_compile_options(${DYNAMIC_ANALYSIS_OPTIONS})
         add_link_options(${DYNAMIC_ANALYSIS_OPTIONS})
     endif()

diff --git a/javascript/MaterialXTest/package-lock.json b/javascript/MaterialXTest/package-lock.json
diff --git a/javascript/MaterialXTest/package.json b/javascript/MaterialXTest/package.json
@@ -16,17 +16,17 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@babel/core": "^7.23.6",
-    "@babel/preset-env": "^7.23.6",
-    "@babel/register": "^7.22.15",
-    "chai": "^4.3.10",
+    "@babel/core": "^7.24.3",
+    "@babel/preset-env": "^7.24.3",
+    "@babel/register": "^7.23.7",
+    "chai": "^4.4.1",
     "copyfiles": "^2.4.1",
-    "karma": "^6.4.2",
+    "karma": "^6.4.3",
     "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",
+    "mocha": "^10.4.0",
     "rimraf": "^3.0.2"
   }
 }