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

PyAPI: remove GPUVertFormat() creation from a list

Browse Source 
We already have `attr_add` method,
best not have two ways to do the same thing.

See: D3830
This commit is contained in:
Campbell Barton
2018-10-29 11:08:55 +11:00
parent 02035c34b7
commit c750ebe113
3 changed files with 7 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/python/gpu/gpu_py_vertex_buffer.c
View File

@@ -222,43 +222,23 @@ static int bpygpu_attr_fill(GPUVertBuf *buf, int id, PyObject *py_seq_data, cons
static PyObject *bpygpu_VertBuf_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject *kwds)
{
const char *error_prefix = "GPUVertBuf.__new__";
struct {
PyObject *py_fmt;
uint len;
} params;
static const char *_keywords[] = {"format", "len", NULL};
static _PyArg_Parser _parser = {"OI:GPUVertBuf.__new__", _keywords, 0};
static _PyArg_Parser _parser = {"O!I:GPUVertBuf.__new__", _keywords, 0};
if (!_PyArg_ParseTupleAndKeywordsFast(
args, kwds, &_parser,
&params.py_fmt,
&BPyGPUVertFormat_Type, &params.py_fmt,
&params.len))
{
return NULL;
}
GPUVertFormat *fmt, fmt_stack;
if (BPyGPUVertFormat_Check(params.py_fmt)) {
fmt = &((BPyGPUVertFormat *)params.py_fmt)->fmt;
}
else if (PyList_Check(params.py_fmt)) {
fmt = &fmt_stack;
GPU_vertformat_clear(fmt);
if (!bpygpu_vertformat_from_PyList(
(PyListObject *)params.py_fmt, error_prefix, fmt))
{
return NULL;
}
}
else {
PyErr_SetString(PyExc_TypeError, "format not understood");
return NULL;
}
struct GPUVertBuf *vbo = GPU_vertbuf_create_with_format(fmt);
const GPUVertFormat *fmt = &((BPyGPUVertFormat *)params.py_fmt)->fmt;
GPUVertBuf *vbo = GPU_vertbuf_create_with_format(fmt);
GPU_vertbuf_data_alloc(vbo, params.len);