Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'shyotl/sunshine'

Browse Source
This commit is contained in:
Latif Khalifa
2013-02-02 02:56:23 +01:00
parent 5cbe633117 1069d5dec4
commit 4317fc36a8
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/lldrawpool.h
View File

@@ -51,9 +51,9 @@ public:
POOL_FULLBRIGHT, POOL_FULLBRIGHT,
POOL_BUMP, POOL_BUMP,
POOL_TERRAIN, POOL_TERRAIN,
POOL_TREE, // Singu Note: Before sky for zcull.
POOL_SKY, POOL_SKY,
POOL_WL_SKY, POOL_WL_SKY,
POOL_TREE,
POOL_GRASS, POOL_GRASS,
POOL_INVISIBLE, // see below * POOL_INVISIBLE, // see below *
POOL_AVATAR, POOL_AVATAR,

2
indra/newview/lldrawpoolwlsky.cpp
View File

@@ -327,8 +327,6 @@ void LLDrawPoolWLSky::renderDeferred(S32 pass)
LLGLDepthTest depth(GL_TRUE, GL_FALSE); LLGLDepthTest depth(GL_TRUE, GL_FALSE);
LLGLDisable clip(GL_CLIP_PLANE0); LLGLDisable clip(GL_CLIP_PLANE0);
gGL.setColorMask(true, false); //Just in case.
LLGLSquashToFarClip far_clip(glh_get_current_projection()); LLGLSquashToFarClip far_clip(glh_get_current_projection());
renderSkyHaze(camHeightLocal); renderSkyHaze(camHeightLocal);

4
indra/newview/pipeline.cpp
View File

@@ -213,10 +213,10 @@ std::string gPoolNames[] =
"POOL_GROUND", "POOL_GROUND",
"POOL_FULLBRIGHT", "POOL_FULLBRIGHT",
"POOL_BUMP", "POOL_BUMP",
"POOL_TERRAIN", "POOL_TERRAIN",
"POOL_TREE", // Singu Note: Before sky for zcull.
"POOL_SKY", "POOL_SKY",
"POOL_WL_SKY", "POOL_WL_SKY",
"POOL_TREE",
"POOL_GRASS", "POOL_GRASS",
"POOL_INVISIBLE", "POOL_INVISIBLE",
"POOL_AVATAR", "POOL_AVATAR",