Merge pull request #5949 from ericmehl/usdWindowsPath

Set `PXR_USD_WINDOWS_DLL_PATH` on Windows
GafferHQ · Jul 10, 2024 · 282c2b4 · 282c2b4
2 parents 36f02ca + b4c7462
commit 282c2b4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Changes.md b/Changes.md
@@ -32,6 +32,7 @@ Fixes
 - Arnold : Fixed rendering of VDB volumes without `file_mem_bytes` metadata.
 - Cycles : Fixed bug preventing a background light from being added to a light group.
 - LightEditor : Fixed regression (introduced in 1.4.8.0) causing the mute and solo icons to not show up for groups.
+- Windows : Fixed conflicts with other software installations on `PATH`. The `PXR_USD_WINDOWS_DLL_PATH` environment variable is now set to an empty string if it is not already set, preventing USD from adding all entries from `PATH` to Python's DLL search paths.
 
 API
 ---

diff --git a/bin/gaffer.cmd b/bin/gaffer.cmd
@@ -19,6 +19,10 @@ call :prependToPath "%GAFFER_ROOT%\ops" IECORE_OP_PATHS
 
 call :prependToPath "%GAFFER_ROOT%\resources\IECoreUSD" PXR_PLUGINPATH_NAME
 call :prependToPath "%GAFFER_ROOT%\materialX" PXR_MTLX_STDLIB_SEARCH_PATHS
+rem Prevent USD from adding entries from `PATH` to Python binary search paths.
+if "%PXR_USD_WINDOWS_DLL_PATH%" EQU "" (
+	set PXR_USD_WINDOWS_DLL_PATH=""
+)
 
 call :prependToPath "%USERPROFILE%\gaffer\opPresets;%GAFFER_ROOT%\opPresets" IECORE_OP_PRESET_PATHS
 call :prependToPath "%USERPROFILE%\gaffer\procedurals;%GAFFER_ROOT%\procedurals" IECORE_PROCEDURAL_PATHS