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:
authorMike Erwin <significant.bit@gmail.com>2017-04-27 21:18:33 +0300
committerMike Erwin <significant.bit@gmail.com>2017-04-27 21:19:03 +0300
commit99fde39f49054fcb2abce58777096f47fc5ad4a9 (patch)
treec44b1e613cf9ee0127fa0e241952f68138070765 /source/blender
parent87a66864bc2ed740b5740bb29eefbf9dcf8387cd (diff)
OpenGL: fix color logic op
GL_LOGIC_OP is a synonym for GL_INDEX_LOGIC_OP, from OpenGL 1.0's indexed color drawing. It's not part of modern GL and causes an error in core profile. GL_COLOR_LOGIC_OP is still supported in the latest GL. It's the last stage before writing to the framebuffer. Part of T51164
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/gpu/intern/gpu_draw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index 3567fc1f062..181cd0ad4bc 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -2271,7 +2271,7 @@ void GPU_state_init(void)
glDisable(GL_ALPHA_TEST);
glDisable(GL_BLEND);
glDisable(GL_DEPTH_TEST);
- glDisable(GL_LOGIC_OP);
+ glDisable(GL_COLOR_LOGIC_OP);
glDisable(GL_STENCIL_TEST);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);