Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.91-release'

Browse Source
This commit is contained in:
Campbell Barton
2020-10-28 19:43:58 +11:00
parent 6527a14cd2 a8ca79cbe6
commit 02ecf29d05
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/modules/sys_info.py
View File

@@ -82,10 +82,10 @@ def write_sysinfo(filepath):
output.write("\t%r\n" % p)
output.write(title("Python (External Binary)"))
output.write("binary path: %s\n" % prepr(sys.executable))
output.write("binary path: %s\n" % prepr(bpy.app.binary_path_python))
try:
py_ver = prepr(subprocess.check_output([
sys.executable,
bpy.app.binary_path_python,
"--version",
]).strip())
except Exception as e:

20
source/blender/python/intern/bpy_interface.c
View File

@@ -306,22 +306,12 @@ void BPY_python_start(bContext *C, int argc, const char **argv)
PyThreadState *py_tstate = NULL;
const char *py_path_bundle = BKE_appdir_folder_id(BLENDER_SYSTEM_PYTHON, NULL);
/* Setting the program name is important so the 'multiprocessing' module
* can launch new Python instances. */
/* Not essential but nice to set our name. */
{
char program_path[FILE_MAX];
if (BKE_appdir_program_python_search(
program_path, sizeof(program_path), PY_MAJOR_VERSION, PY_MINOR_VERSION)) {
wchar_t program_path_wchar[FILE_MAX];
BLI_strncpy_wchar_from_utf8(
program_path_wchar, program_path, ARRAY_SIZE(program_path_wchar));
Py_SetProgramName(program_path_wchar);
}
else {
fprintf(stderr,
"Unable to find the python binary, "
"the multiprocessing module may not be functional!\n");
}
const char *program_path = BKE_appdir_program_path();
wchar_t program_path_wchar[FILE_MAX];
BLI_strncpy_wchar_from_utf8(program_path_wchar, program_path, ARRAY_SIZE(program_path_wchar));
Py_SetProgramName(program_path_wchar);
}
/* must run before python initializes */