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/gpu/intern/gpu_state_private.hh | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/gpu/intern/gpu_state_private.hh') diff --git a/source/blender/gpu/intern/gpu_state_private.hh b/source/blender/gpu/intern/gpu_state_private.hh index d93556a1058..db1747127d4 100644 --- a/source/blender/gpu/intern/gpu_state_private.hh +++ b/source/blender/gpu/intern/gpu_state_private.hh @@ -153,6 +153,7 @@ class StateManager { public: GPUState state; GPUStateMutable mutable_state; + bool use_bgl = false; public: StateManager(); -- cgit v1.2.3