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>2022-02-06 14:39:56 +0300
committerClément Foucault <foucault.clem@gmail.com>2022-02-06 14:39:56 +0300
commite440691e89a6c4ef7e568b17a605fc248d717be2 (patch)
tree9d733248b3465e026c90ec748164b116cf498960
parent48fbf0baea88b6c9e1d41f5baafb6da1eb636a27 (diff)
parent8be20fcc61137711e0d08031d3807953659f5c0a (diff)
Merge branch 'blender-v3.1-release'
-rw-r--r--source/blender/gpu/opengl/gl_debug.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc
index fe558677f56..95dea43636d 100644
--- a/source/blender/gpu/opengl/gl_debug.cc
+++ b/source/blender/gpu/opengl/gl_debug.cc
@@ -196,6 +196,9 @@ void init_gl_callbacks()
void check_gl_error(const char *info)
{
+ if (!(G.debug & G_DEBUG_GPU)) {
+ return;
+ }
GLenum error = glGetError();
#define ERROR_CASE(err) \