Merge branch 'blender-v4.2-release'

This commit is contained in:
Miguel Pozo
2024-06-13 15:54:24 +02:00

View File

@@ -6,7 +6,7 @@
#if BLI_SUBPROCESS_SUPPORT
# include "BKE_appdir.hh"
# include "BLI_tempfile.h"
# include "BLI_fileops.hh"
# include "BLI_hash.hh"
# include "BLI_path_util.h"
@@ -163,8 +163,9 @@ void GPU_compilation_subprocess_run(const char *subprocess_name)
GPUContext *gpu_context = GPU_context_create(nullptr, ghost_context);
GPU_init();
BKE_tempdir_init(nullptr);
std::string cache_dir = std::string(BKE_tempdir_base()) + "BLENDER_SHADER_CACHE" + SEP_STR;
static char tmp_dir[1024];
BLI_temp_directory_path_get(tmp_dir, sizeof(tmp_dir));
std::string cache_dir = std::string(tmp_dir) + "BLENDER_SHADER_CACHE" + SEP_STR;
BLI_dir_create_recursive(cache_dir.c_str());
while (true) {