[Bf-blender-cvs] [59c5623372] blender2.8: Draw Manager: fix glitches when setting 3d cursor position by click.
Clément Foucault
noreply at git.blender.org
Sat Mar 25 19:56:56 CET 2017
Commit: 59c562337291217c2fbd48adc8b3862c24771d09
Author: Clément Foucault
Date: Sat Mar 25 18:56:19 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB59c562337291217c2fbd48adc8b3862c24771d09
Draw Manager: fix glitches when setting 3d cursor position by click.
===================================================================
M source/blender/draw/intern/draw_view.c
M source/blender/gpu/intern/gpu_viewport.c
===================================================================
diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c
index 2620989bcb..80828d2f11 100644
--- a/source/blender/draw/intern/draw_view.c
+++ b/source/blender/draw/intern/draw_view.c
@@ -553,7 +553,7 @@ void DRW_draw_background(void)
/* Gradient background Color */
gpuMatrixBegin3D(); /* TODO: finish 2D API */
- glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+ glDisable(GL_DEPTH_TEST);
VertexFormat *format = immVertexFormat();
unsigned pos = add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT);
@@ -578,6 +578,8 @@ void DRW_draw_background(void)
immUnbindProgram();
gpuMatrixEnd();
+
+ glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
}
else {
/* Solid background Color */
diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c
index 8f0a38c867..3e9b7da6d7 100644
--- a/source/blender/gpu/intern/gpu_viewport.c
+++ b/source/blender/gpu/intern/gpu_viewport.c
@@ -289,6 +289,7 @@ void GPU_viewport_unbind(GPUViewport *viewport)
GPU_framebuffer_restore();
glEnable(GL_SCISSOR_TEST);
+ glDisable(GL_DEPTH_TEST);
/* This might be bandwidth limiting */
draw_ofs_to_screen(viewport);
More information about the Bf-blender-cvs
mailing list