[Bf-blender-cvs] [48c5129d1fc] master: Fix errors in Buffer.dimensions `setter`
Campbell Barton
noreply at git.blender.org
Thu Apr 22 04:38:07 CEST 2021
Commit: 48c5129d1fcdaf53a281bf0359af85bd0185f038
Author: Campbell Barton
Date: Thu Apr 22 12:34:26 2021 +1000
Branches: master
https://developer.blender.org/rB48c5129d1fcdaf53a281bf0359af85bd0185f038
Fix errors in Buffer.dimensions `setter`
- Error accessing the length from a sequence.
- Error comparing a boolean to -1.
Issues introduced in 19360c2c1cf50c80b9720137b88db2c2f3626ddc
===================================================================
M source/blender/python/gpu/gpu_py_buffer.c
===================================================================
diff --git a/source/blender/python/gpu/gpu_py_buffer.c b/source/blender/python/gpu/gpu_py_buffer.c
index 8ee11ff882c..e36e3b42617 100644
--- a/source/blender/python/gpu/gpu_py_buffer.c
+++ b/source/blender/python/gpu/gpu_py_buffer.c
@@ -81,7 +81,7 @@ static bool pygpu_buffer_pyobj_as_shape(PyObject *shape_obj,
}
}
else if (PySequence_Check(shape_obj)) {
- Py_ssize_t shape_len = PySequence_Size(shape_obj);
+ shape_len = PySequence_Size(shape_obj);
if (shape_len > MAX_DIMENSIONS) {
PyErr_SetString(PyExc_AttributeError,
"too many dimensions, max is " STRINGIFY(MAX_DIMENSIONS));
@@ -111,8 +111,6 @@ static bool pygpu_buffer_pyobj_as_shape(PyObject *shape_obj,
return false;
}
}
-
- *r_shape_len = shape_len;
}
else {
PyErr_Format(PyExc_TypeError,
@@ -398,7 +396,7 @@ static PyObject *pygpu_buffer__tp_new(PyTypeObject *UNUSED(type), PyObject *args
return NULL;
}
- if (pygpu_buffer_pyobj_as_shape(length_ob, shape, &shape_len) == -1) {
+ if (!pygpu_buffer_pyobj_as_shape(length_ob, shape, &shape_len)) {
return NULL;
}
More information about the Bf-blender-cvs
mailing list