Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-10-08 17:19:42 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-10-08 17:36:17 +0300
commitf12b0373f322b710b9fa5cebb67bdf363ff90e9f (patch)
treeccb30a6d7cd12cac94a3a7ebefa72b162f4df1b2 /source/blender/gpu/opengl/gl_debug.cc
parent5f364216acd5bf0f8098b1da1cdb2e75d42d59b3 (diff)
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.
Diffstat (limited to 'source/blender/gpu/opengl/gl_debug.cc')
-rw-r--r--source/blender/gpu/opengl/gl_debug.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc
index 797f9ff404c..b2b05124463 100644
--- a/source/blender/gpu/opengl/gl_debug.cc
+++ b/source/blender/gpu/opengl/gl_debug.cc
@@ -200,7 +200,7 @@ void check_gl_error(const char *info)
void check_gl_resources(const char *info)
{
- if (!(G.debug & G_DEBUG_GPU)) {
+ if (!(G.debug & G_DEBUG_GPU) || GPU_bgl_get()) {
return;
}