diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 2 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_capi_utils.h | 4 | ||||
| -rw-r--r-- | source/blender/python/mathutils/mathutils.c | 4 |
4 files changed, 5 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f73149adc04..85a9d633d3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -906,8 +906,8 @@ if(WITH_PYTHON) # Do this before main 'platform_*' checks, # because UNIX will search for the old Python paths which may not exist. # giving errors about missing paths before this case is met. - if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.9") - message(FATAL_ERROR "At least Python 3.9 is required to build, but found Python ${PYTHON_VERSION}") + if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.10") + message(FATAL_ERROR "At least Python 3.10 is required to build, but found Python ${PYTHON_VERSION}") endif() file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/scripts/addons") diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 03a75468400..bf38f4c2928 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -381,7 +381,7 @@ CLANG_FORMAT_VERSION_MEX="10.0" PYTHON_VERSION="3.10.2" PYTHON_VERSION_SHORT="3.10" -PYTHON_VERSION_MIN="3.9" +PYTHON_VERSION_MIN="3.10" PYTHON_VERSION_MEX="3.12" PYTHON_VERSION_INSTALLED=$PYTHON_VERSION_SHORT PYTHON_FORCE_BUILD=false diff --git a/source/blender/python/intern/bpy_capi_utils.h b/source/blender/python/intern/bpy_capi_utils.h index 0889dec36c8..a3cebea3fdb 100644 --- a/source/blender/python/intern/bpy_capi_utils.h +++ b/source/blender/python/intern/bpy_capi_utils.h @@ -20,8 +20,8 @@ #pragma once -#if PY_VERSION_HEX < 0x03090000 -# error "Python 3.9 or greater is required, you'll need to update your Python." +#if PY_VERSION_HEX < 0x030a0000 +# error "Python 3.10 or greater is required, you'll need to update your Python." #endif #ifdef __cplusplus diff --git a/source/blender/python/mathutils/mathutils.c b/source/blender/python/mathutils/mathutils.c index 6eee9ceebb8..22c4549575f 100644 --- a/source/blender/python/mathutils/mathutils.c +++ b/source/blender/python/mathutils/mathutils.c @@ -90,11 +90,7 @@ Py_hash_t mathutils_array_hash(const float *array, size_t array_len) x = 0x345678UL; i = 0; while (--len >= 0) { -#if PY_VERSION_HEX >= 0x30a0000 /* Version: 3.10. */ y = _Py_HashDouble(NULL, (double)(array[i++])); -#else - y = _Py_HashDouble((double)(array[i++])); -#endif if (y == -1) { return -1; } |