diff options
author | Campbell Barton <campbell@blender.org> | 2022-02-22 02:18:15 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-02-22 02:18:15 +0300 |
commit | ca12696257ac0acd34dd5481b74f33feca9a4c14 (patch) | |
tree | 00f40195c197447cad12567acc0540d3ac12d409 /source/blender/python | |
parent | b13bf8556b8d4d8456deb8fa769ce963aed47065 (diff) | |
parent | ec5bbebf3ee165869eba5e980d22f261d4d06f68 (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/intern/bpy_capi_utils.h | 4 | ||||
-rw-r--r-- | source/blender/python/mathutils/mathutils.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/python/intern/bpy_capi_utils.h b/source/blender/python/intern/bpy_capi_utils.h index 4a2e5fdebb7..223c6ad5f7e 100644 --- a/source/blender/python/intern/bpy_capi_utils.h +++ b/source/blender/python/intern/bpy_capi_utils.h @@ -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 diff --git a/source/blender/python/mathutils/mathutils.c b/source/blender/python/mathutils/mathutils.c index 89fb89cfd41..8ed156a7e55 100644 --- a/source/blender/python/mathutils/mathutils.c +++ b/source/blender/python/mathutils/mathutils.c @@ -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; } |