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

PyAPI: remove deprecated 2D_/3D_ prefix for built-in shader names

Browse Source 
Names passed to gpu.shader.from_builtin()
no longer skip the 2D_/3D_ prefix.
This commit is contained in:
Campbell Barton
2023-05-23 15:51:54 +10:00
parent fd68f977e0
commit 9a8fd2f1dd
6 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -785,24 +785,6 @@ PyTypeObject BPyGPUShader_Type = {
/** \name gpu.shader Module API
* \{ */
static int pyc_parse_buitinshader_w_backward_compatibility(PyObject *o, void *p)
{
struct PyC_StringEnum *e = p;
const char *value = PyUnicode_AsUTF8(o);
if (value && ELEM(value[0], u'2', u'3')) {
/* Deprecated enums that start with "3D_" or "2D_". */
value += 3;
for (int i = 0; e->items[i].id; i++) {
if (STREQ(e->items[i].id, value)) {
e->value_found = e->items[i].value;
return 1;
}
}
}
return PyC_ParseStringEnum(o, p);
}
PyDoc_STRVAR(pygpu_shader_unbind_doc,
".. function:: unbind()\n"
"\n"
@@ -851,7 +833,7 @@ static PyObject *pygpu_shader_from_builtin(PyObject *UNUSED(self), PyObject *arg
if (!_PyArg_ParseTupleAndKeywordsFast(args,
kwds,
&_parser,
pyc_parse_buitinshader_w_backward_compatibility,
PyC_ParseStringEnum,
&pygpu_bultinshader,
PyC_ParseStringEnum,
&pygpu_config))