Merge branch 'sunshine' of https://github.com/Shyotl/SingularityViewer

2013-02-02 02:22:46 +01:00
parent 5cbe633117 1069d5dec4
commit 57d43786ab
3 changed files with 3 additions and 5 deletions
--- 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,
--- 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);
--- 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",