From 14c53c5018abaa1ab05f1821cdb1b2e0b7824d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Fri, 9 Oct 2020 16:33:24 +0200 Subject: BGL: fix issues with addons using BGL at startup This was an issue for Cycles. This also makes the `GPU_bgl*` functions less fragile by checking for null pointers. --- source/blender/python/intern/bpy.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source/blender/python') diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index de8fd87db58..a4a73d2aa75 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -35,6 +35,8 @@ #include "RNA_access.h" #include "RNA_types.h" +#include "GPU_state.h" + #include "bpy.h" #include "bpy_app.h" #include "bpy_capi_utils.h" @@ -330,6 +332,9 @@ static PyMethodDef meth_bpy_escape_identifier = { static PyObject *bpy_import_test(const char *modname) { PyObject *mod = PyImport_ImportModuleLevel(modname, NULL, NULL, NULL, 0); + + GPU_bgl_end(); + if (mod) { Py_DECREF(mod); } -- cgit v1.2.3