forked from bartvdbraak/blender
Merge branch 'blender-v3.1-release'
This commit is contained in:
commit
ca12696257
@ -889,8 +889,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")
|
||||
|
@ -366,7 +366,7 @@ CLANG_FORMAT_VERSION_MEX="14.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
|
||||
|
@ -6,8 +6,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
|
||||
|
@ -76,11 +76,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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user