griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-11-02 15:44:22 +11:00
parent b3919319fb 99387c0749
commit e46c58df7c
10 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/python/gpu/gpu_py_framebuffer.cc
View File

@@ -367,9 +367,8 @@ static PyObject *pygpu_framebuffer__tp_new(PyTypeObject * /*self*/, PyObject *ar
if (PySequence_Check(color_attachements)) {
color_attachements_len = PySequence_Size(color_attachements);
if (color_attachements_len > BPYGPU_FB_MAX_COLOR_ATTACHMENT) {
PyErr_SetString(
PyExc_AttributeError,
"too many attachements, max is " STRINGIFY(BPYGPU_FB_MAX_COLOR_ATTACHMENT));
PyErr_SetString(PyExc_AttributeError,
"too many attachments, max is " STRINGIFY(BPYGPU_FB_MAX_COLOR_ATTACHMENT));
return nullptr;
}

2
source/blender/python/mathutils/mathutils_bvhtree.cc
View File

@@ -643,7 +643,7 @@ PyDoc_STRVAR(
"\n"
" :arg vertices: float triplets each representing ``(x, y, z)``\n"
" :type vertices: float triplet sequence\n"
" :arg polygons: Sequence of polyugons, each containing indices to the vertices argument.\n"
" :arg polygons: Sequence of polygons, each containing indices to the vertices argument.\n"
" :type polygons: Sequence of sequences containing ints\n"
" :arg all_triangles: Use when all **polygons** are triangles for more efficient "
"conversion.\n"