From f12b0373f322b710b9fa5cebb67bdf363ff90e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Thu, 8 Oct 2020 16:19:42 +0200 Subject: BGL: Workaround broken bgl usage caused by GPU refactor This directly adress the issues caused by rB536c2e0ec916. Since the state tracking is done at a lower level, using the bgl functions needs to be safegarded by the state manager. The current workaround is to bypass `apply_state` when inside a callback that used a `bgl` function. Related to T80730. This fix T81003. Also this fix the default blend equation for callbacks. Fixes T80169 T81289. --- source/blender/editors/space_api/spacetypes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/space_api') diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index 2a18ffafc6c..b89c8cb2193 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -281,7 +281,7 @@ void ED_region_draw_cb_draw(const bContext *C, ARegion *region, int type) } if (has_drawn_something) { /* This is needed until we get rid of BGL which can change the states we are tracking. */ - GPU_force_state(); + GPU_bgl_end(); } } -- cgit v1.2.3