[Bf-blender-cvs] [e80527ec4de] master: DRW manager: Always assume that the GL_DITHER and GL_SCISSOR_TEST should be disabled if not used.

mano-wii noreply at git.blender.org
Wed Mar 27 23:37:05 CET 2019


Commit: e80527ec4de2f5ce06477589ef2ca4893ba17ead
Author: mano-wii
Date:   Wed Mar 27 19:36:12 2019 -0300
Branches: master
https://developer.blender.org/rBe80527ec4de2f5ce06477589ef2ca4893ba17ead

DRW manager: Always assume that the GL_DITHER and GL_SCISSOR_TEST should be disabled if not used.

This may fix a glitch detected when you perform edited mesh selection.
See comment in rB00bdb5cdf08f

===================================================================

M	source/blender/draw/intern/draw_manager.c

===================================================================

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 9f956717fb2..9dd6d08afcc 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1784,11 +1784,6 @@ void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph
 
 	drw_viewport_var_init();
 
-	/* set default viewport */
-	gpuPushAttr(GPU_ENABLE_BIT | GPU_VIEWPORT_BIT);
-	glDisable(GL_SCISSOR_TEST);
-	glViewport(0, 0, size[0], size[1]);
-
 	/* Main rendering. */
 	rctf view_rect;
 	rcti render_rect;
@@ -1810,8 +1805,6 @@ void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph
 	glDisable(GL_DEPTH_TEST);
 
 	/* Restore Drawing area. */
-	gpuPopAttr();
-	glEnable(GL_SCISSOR_TEST);
 	GPU_framebuffer_restore();
 
 	/* Changing Context */
@@ -2543,9 +2536,7 @@ void DRW_framebuffer_select_id_release(ARegion *ar)
 		ED_view3d_clipping_disable();
 	}
 
-	glEnable(GL_SCISSOR_TEST);
 	GPU_depth_test(false);
-	glEnable(GL_DITHER);
 
 	GPU_framebuffer_restore();



More information about the Bf-blender-cvs mailing list