[Bf-blender-cvs] [7175838b61] blender2.8: Draw Manager: Fix ortho grid in front of overlays.

Clément Foucault noreply at git.blender.org
Tue Feb 28 15:17:47 CET 2017


Commit: 7175838b6166f1d37d96cad5c5aa4a8c89a5bfc2
Author: Clément Foucault
Date:   Tue Feb 28 15:15:34 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB7175838b6166f1d37d96cad5c5aa4a8c89a5bfc2

Draw Manager: Fix ortho grid in front of overlays.

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

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

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

diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c
index f3865a7a92..1983c1cd6e 100644
--- a/source/blender/draw/intern/draw_view.c
+++ b/source/blender/draw/intern/draw_view.c
@@ -522,9 +522,11 @@ void DRW_draw_grid(void)
 
 	glEnable(GL_DEPTH_TEST);
 	glDepthFunc(GL_LESS);
-	glDepthMask(GL_TRUE);
 
 	if (!draw_floor) {
+		/* Do not get in front of overlays */
+		glDepthMask(GL_FALSE);
+
 		ED_region_pixelspace(ar);
 		*(&grid_unit) = NULL;  /* drawgrid need this to detect/affect smallest valid unit... */
 		drawgrid(&scene->unit, ar, v3d, &grid_unit);
@@ -535,6 +537,7 @@ void DRW_draw_grid(void)
 		glLoadMatrixf((float *)rv3d->viewmat);
 	}
 	else {
+		glDepthMask(GL_TRUE);
 		drawfloor(scene, v3d, &grid_unit);
 	}
 }




More information about the Bf-blender-cvs mailing list