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",