From 1069d5dec43ad41a0728a927297e45247b925dd9 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 1 Feb 2013 17:16:01 -0600
Subject: [PATCH] Draw trees before sky. Z-cull may be beneficial. Also, was
 incorrectly setting alphawrite off for deferred wlsky pass.

---
 indra/newview/lldrawpool.h        | 2 +-
 indra/newview/lldrawpoolwlsky.cpp | 2 --
 indra/newview/pipeline.cpp        | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h
index 31cd72628..384e39837 100644
--- a/indra/newview/lldrawpool.h
+++ b/indra/newview/lldrawpool.h
@@ -51,9 +51,9 @@ public:
 		POOL_FULLBRIGHT,
 		POOL_BUMP,
 		POOL_TERRAIN,	
+		POOL_TREE,	// Singu Note: Before sky for zcull.
 		POOL_SKY,
 		POOL_WL_SKY,
-		POOL_TREE,
 		POOL_GRASS,
 		POOL_INVISIBLE, // see below *
 		POOL_AVATAR,
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp
index d119f247f..104f6cac1 100644
--- a/indra/newview/lldrawpoolwlsky.cpp
+++ b/indra/newview/lldrawpoolwlsky.cpp
@@ -327,8 +327,6 @@ void LLDrawPoolWLSky::renderDeferred(S32 pass)
 	LLGLDepthTest depth(GL_TRUE, GL_FALSE);
 	LLGLDisable clip(GL_CLIP_PLANE0);
 
-	gGL.setColorMask(true, false);	//Just in case.
-
 	LLGLSquashToFarClip far_clip(glh_get_current_projection());
 
 	renderSkyHaze(camHeightLocal);
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 571b0eff1..88b9f9c20 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -213,10 +213,10 @@ std::string gPoolNames[] =
 	"POOL_GROUND",
 	"POOL_FULLBRIGHT",
 	"POOL_BUMP",
-	"POOL_TERRAIN",	
+	"POOL_TERRAIN",
+	"POOL_TREE", // Singu Note: Before sky for zcull.
 	"POOL_SKY",
 	"POOL_WL_SKY",
-	"POOL_TREE",
 	"POOL_GRASS",
 	"POOL_INVISIBLE",
 	"POOL_AVATAR",