[Bf-blender-cvs] [4539c2b] blender2.8: Viewport: floor cleanup

[Dalai Felinto]

Commit: 4539c2b173a942ecb5320eac5e3777cc6d46beae
Author: Dalai Felinto
Date:   Thu Oct 6 23:40:48 2016 +0000
Branches: blender2.8
https://developer.blender.org/rB4539c2b173a942ecb5320eac5e3777cc6d46beae

Viewport: floor cleanup

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

M	source/blender/editors/space_view3d/view3d_draw.c

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index fe6dae0..d249a9e 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -777,11 +777,13 @@ static void view3d_draw_grid(const bContext *C, ARegion *ar)
 	/* needs to be done always, gridview is adjusted in drawgrid() now, but only for ortho views. */
 	rv3d->gridview = ED_view3d_grid_scale(scene, v3d, grid_unit);
 
+	glEnable(GL_DEPTH_TEST);
+
 	if (!draw_floor) {
 		ED_region_pixelspace(ar);
 		*(&grid_unit) = NULL;  /* drawgrid need this to detect/affect smallest valid unit... */
 		drawgrid(&scene->unit, ar, v3d, &grid_unit);
-		/* XXX make function? replaces persp(1) */
+
 		glMatrixMode(GL_PROJECTION);
 		glLoadMatrixf(rv3d->winmat);
 		glMatrixMode(GL_MODELVIEW);
@@ -790,8 +792,9 @@ static void view3d_draw_grid(const bContext *C, ARegion *ar)
 	else {
 		drawfloor(scene, v3d, &grid_unit, false);
 	}
-}
 
+	glDisable(GL_DEPTH_TEST);
+}
 
 /* ******************** view loop ***************** */