# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1400639395 -10800
# Node ID a7c7fbeef93b0007fb636d4f708cfa4423611dfe
# Parent  fae6dc0fd4623dbf575ee68bb4416317d3dcfdfb
[goatview] fixed grid transparency

diff -r fae6dc0fd462 -r a7c7fbeef93b goatview/src/goatview.cc
--- a/goatview/src/goatview.cc	Wed May 21 05:09:33 2014 +0300
+++ b/goatview/src/goatview.cc	Wed May 21 05:29:55 2014 +0300
@@ -425,25 +425,25 @@
 	glRotatef(cam_phi, 1, 0, 0);
 	glRotatef(cam_theta, 0, 1, 0);
 
-	draw_grid();
-
-	if(!scene) return;
-
-	if(use_nodes) {
-		int node_count = goat3d_get_node_count(scene);
-		for(int i=0; i<node_count; i++) {
-			goat3d_node *node = goat3d_get_node(scene, i);
-			if(!goat3d_get_node_parent(node)) {
-				draw_node(node);	// only draw root nodes, the rest will be drawn recursively
+	if(scene) {
+		if(use_nodes) {
+			int node_count = goat3d_get_node_count(scene);
+			for(int i=0; i<node_count; i++) {
+				goat3d_node *node = goat3d_get_node(scene, i);
+				if(!goat3d_get_node_parent(node)) {
+					draw_node(node);	// only draw root nodes, the rest will be drawn recursively
+				}
+			}
+		} else {
+			int mesh_count = goat3d_get_mesh_count(scene);
+			for(int i=0; i<mesh_count; i++) {
+				goat3d_mesh *mesh = goat3d_get_mesh(scene, i);
+				draw_mesh(mesh);
 			}
 		}
-	} else {
-		int mesh_count = goat3d_get_mesh_count(scene);
-		for(int i=0; i<mesh_count; i++) {
-			goat3d_mesh *mesh = goat3d_get_mesh(scene, i);
-			draw_mesh(mesh);
-		}
 	}
+
+	draw_grid();
 }
 
 void GoatViewport::toggle_lighting()
@@ -472,12 +472,13 @@
 	glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BITS);
 
 	glEnable(GL_BLEND);
-	glDepthFunc(GL_ALWAYS);
+	glDepthMask(0);
 
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	draw_grid(sz0 * 2.0, 10, 1.0 - alpha);
 	draw_grid(sz1 * 2.0, 10, alpha);
 
+	glDepthMask(1);
 	glPopAttrib();
 }