Merge branch 'blender-v4.1-release'

2024-02-22 13:51:48 +01:00
parent 50709ca253 3dc832a904
commit 396348eea9
31 changed files with 378 additions and 361 deletions
--- a/tests/performance/api/environment.py
+++ b/tests/performance/api/environment.py
@@ -26,7 +26,7 @@ class TestEnvironment:
        self.build_dir = base_dir / 'build'
        self.install_dir = self.build_dir / "bin"
        self.lib_dir = base_dir / 'lib'
-        self.benchmarks_dir = self.blender_git_dir.parent / 'lib' / 'benchmarks'
+        self.benchmarks_dir = self.blender_git_dir / 'tests' / 'benchmarks'
        self.git_executable = 'git'
        self.cmake_executable = 'cmake'
        self.cmake_options = ['-DWITH_INTERNATIONAL=OFF', '-DWITH_BUILDINFO=OFF']