archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender-v3.1-release'

Browse Source
This commit is contained in:
Campbell Barton
2022-02-22 10:18:15 +11:00
parent b13bf8556b ec5bbebf3e
commit ca12696257
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -889,8 +889,8 @@ if(WITH_PYTHON)
# Do this before main 'platform_*' checks, # Do this before main 'platform_*' checks,
# because UNIX will search for the old Python paths which may not exist. # because UNIX will search for the old Python paths which may not exist.
# giving errors about missing paths before this case is met. # giving errors about missing paths before this case is met.
if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.9") if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.10")
message(FATAL_ERROR "At least Python 3.9 is required to build, but found Python ${PYTHON_VERSION}") message(FATAL_ERROR "At least Python 3.10 is required to build, but found Python ${PYTHON_VERSION}")
endif() endif()
file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/scripts/addons") file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/scripts/addons")

2
build_files/build_environment/install_deps.sh
View File

@@ -366,7 +366,7 @@ CLANG_FORMAT_VERSION_MEX="14.0"
PYTHON_VERSION="3.10.2" PYTHON_VERSION="3.10.2"
PYTHON_VERSION_SHORT="3.10" PYTHON_VERSION_SHORT="3.10"
PYTHON_VERSION_MIN="3.9" PYTHON_VERSION_MIN="3.10"
PYTHON_VERSION_MEX="3.12" PYTHON_VERSION_MEX="3.12"
PYTHON_VERSION_INSTALLED=$PYTHON_VERSION_SHORT PYTHON_VERSION_INSTALLED=$PYTHON_VERSION_SHORT
PYTHON_FORCE_BUILD=false PYTHON_FORCE_BUILD=false

4
source/blender/python/intern/bpy_capi_utils.h
View File

@@ -6,8 +6,8 @@
#pragma once #pragma once
#if PY_VERSION_HEX < 0x03090000 #if PY_VERSION_HEX < 0x030a0000
# error "Python 3.9 or greater is required, you'll need to update your Python." # error "Python 3.10 or greater is required, you'll need to update your Python."
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

4
source/blender/python/mathutils/mathutils.c
View File

@@ -76,11 +76,7 @@ Py_hash_t mathutils_array_hash(const float *array, size_t array_len)
x = 0x345678UL; x = 0x345678UL;
i = 0; i = 0;
while (--len >= 0) { while (--len >= 0) {
#if PY_VERSION_HEX >= 0x30a0000 /* Version: 3.10. */
y = _Py_HashDouble(NULL, (double)(array[i++])); y = _Py_HashDouble(NULL, (double)(array[i++]));
#else
y = _Py_HashDouble((double)(array[i++]));
#endif
if (y == -1) { if (y == -1) {
return -1; return -1;
} }