Merge branch 'blender-v4.3-release'

2024-10-07 11:23:34 +02:00
parent a97fe64c4f 02973568d6
commit ba98ec4a43
1 changed files with 4 additions and 1 deletions
--- a/build_files/cmake/Modules/FindOptiX.cmake
+++ b/build_files/cmake/Modules/FindOptiX.cmake
@@ -28,7 +28,10 @@ set(_optix_SEARCH_DIRS

 # TODO: Which environment uses this?
 if(DEFINED ENV{PROGRAMDATA})
-  list(APPEND _optix_SEARCH_DIRS "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 7.3.0")
+  list(APPEND _optix_SEARCH_DIRS
+    "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 7.4.0"
+    "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 7.3.0"
+  )
 endif()

 find_path(OPTIX_INCLUDE_DIR