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

Cleanup: rename VertBuf.fill_attribute > attr_fill

Browse Source
This commit is contained in:
Campbell Barton
2018-10-23 10:49:36 +11:00
parent 43c6aba670
commit e5182fa101
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/python/gpu/gpu_py_shader.c
View File

@@ -572,15 +572,15 @@ static PyObject *bpygpu_shader_attr_from_name(
return NULL; return NULL;
} }
int attrib = GPU_shader_get_attribute(self->shader, name); int attr = GPU_shader_get_attribute(self->shader, name);
if (attrib == -1) { if (attr == -1) {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"GPUShader.attr_from_name: attribute %.32s not found", name); "GPUShader.attr_from_name: attribute %.32s not found", name);
return NULL; return NULL;
} }
return PyLong_FromLong(attrib); return PyLong_FromLong(attr);
} }
PyDoc_STRVAR(bpygpu_shader_calc_format_doc, PyDoc_STRVAR(bpygpu_shader_calc_format_doc,

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

@@ -189,7 +189,7 @@ finally:
return ok; return ok;
} }
static int bpygpu_fill_attribute(GPUVertBuf *buf, int id, PyObject *py_seq_data, const char *error_prefix) static int bpygpu_attr_fill(GPUVertBuf *buf, int id, PyObject *py_seq_data, const char *error_prefix)
{ {
if (id < 0 || id >= buf->format.attr_len) { if (id < 0 || id >= buf->format.attr_len) {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
@@ -265,8 +265,8 @@ static PyObject *bpygpu_VertBuf_new(PyTypeObject *UNUSED(type), PyObject *args,
return BPyGPUVertBuf_CreatePyObject(vbo); return BPyGPUVertBuf_CreatePyObject(vbo);
} }
PyDoc_STRVAR(bpygpu_VertBuf_fill_attribute_doc, PyDoc_STRVAR(bpygpu_VertBuf_attr_fill_doc,
"fill_attribute(identifier, data)\n" "attr_fill(identifier, data)\n"
"\n" "\n"
" Insert data into the buffer for a single attribute.\n" " Insert data into the buffer for a single attribute.\n"
"\n" "\n"
@@ -275,13 +275,13 @@ PyDoc_STRVAR(bpygpu_VertBuf_fill_attribute_doc,
" :param data: Sequence of data that should be stored in the buffer\n" " :param data: Sequence of data that should be stored in the buffer\n"
" :type data: sequence of individual values or tuples\n" " :type data: sequence of individual values or tuples\n"
); );
static PyObject *bpygpu_VertBuf_fill_attribute(BPyGPUVertBuf *self, PyObject *args, PyObject *kwds) static PyObject *bpygpu_VertBuf_attr_fill(BPyGPUVertBuf *self, PyObject *args, PyObject *kwds)
{ {
PyObject *data; PyObject *data;
PyObject *identifier; PyObject *identifier;
static const char *_keywords[] = {"identifier", "data", NULL}; static const char *_keywords[] = {"identifier", "data", NULL};
static _PyArg_Parser _parser = {"OO:fill_attribute", _keywords, 0}; static _PyArg_Parser _parser = {"OO:attr_fill", _keywords, 0};
if (!_PyArg_ParseTupleAndKeywordsFast( if (!_PyArg_ParseTupleAndKeywordsFast(
args, kwds, &_parser, args, kwds, &_parser,
&identifier, &data)) &identifier, &data))
@@ -310,7 +310,7 @@ static PyObject *bpygpu_VertBuf_fill_attribute(BPyGPUVertBuf *self, PyObject *ar
} }
if (!bpygpu_fill_attribute(self->buf, id, data, "GPUVertBuf.fill_attribute")) { if (!bpygpu_attr_fill(self->buf, id, data, "GPUVertBuf.attr_fill")) {
return NULL; return NULL;
} }
@@ -319,8 +319,8 @@ static PyObject *bpygpu_VertBuf_fill_attribute(BPyGPUVertBuf *self, PyObject *ar
static struct PyMethodDef bpygpu_VertBuf_methods[] = { static struct PyMethodDef bpygpu_VertBuf_methods[] = {
{"fill_attribute", (PyCFunction) bpygpu_VertBuf_fill_attribute, {"attr_fill", (PyCFunction) bpygpu_VertBuf_attr_fill,
METH_VARARGS | METH_KEYWORDS, bpygpu_VertBuf_fill_attribute_doc}, METH_VARARGS | METH_KEYWORDS, bpygpu_VertBuf_attr_fill_doc},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };