kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Python API: allow passing None to some BGL functions instead of bgl.Buffer

Browse Source 
Many OpenGL functions take NULL pointers, passing those was quite complicated
with some addons even using ctypes to manipulate internal bgl.Buffer pointers.
This commit is contained in:
Brecht Van Lommel 2019-03-26 19:48:44 +01:00
parent c515ea2e93
commit 85915ae1aa
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/python/generic/bgl.c
View File

@ -132,9 +132,9 @@
#define GLclampfP_def(number) Buffer *bgl_buffer##number #define GLclampfP_def(number) Buffer *bgl_buffer##number
#endif #endif
#define GLvoidP_str "O!" #define GLvoidP_str "O&"
#define GLvoidP_var(number) (bgl_buffer##number)->buf.asvoid #define GLvoidP_var(number) ((bgl_buffer##number) ? (bgl_buffer##number)->buf.asvoid : NULL)
#define GLvoidP_ref(number) &BGL_bufferType, &bgl_buffer##number #define GLvoidP_ref(number) BGL_BufferOrNoneConverter, &bgl_buffer##number
#define GLvoidP_def(number) Buffer *bgl_buffer##number #define GLvoidP_def(number) Buffer *bgl_buffer##number
#define GLsizeiP_str "O!" #define GLsizeiP_str "O!"
@ -703,6 +703,22 @@ Buffer *BGL_MakeBuffer(int type, int ndimensions, int *dimensions, void *initbuf
return buffer; return buffer;
} }
/* Custom converter function so we can support a buffer or NULL. */
static int BGL_BufferOrNoneConverter(PyObject *object, Buffer **buffer)
{
if (object == Py_None) {
*buffer = NULL;
return 1;
}
else if (PyObject_TypeCheck(object, &BGL_bufferType)) {
*buffer = (Buffer *)object;
return 1;
}
else {
PyErr_SetString(PyExc_TypeError, "expected a bgl.Buffer or None");
return 0;
}
}
#define MAX_DIMENSIONS 256 #define MAX_DIMENSIONS 256
static PyObject *Buffer_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject *kwds) static PyObject *Buffer_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject *kwds)