livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

master
Leslie Linden 2011-05-12 13:31:33 -07:00
parent 4268700fcf 8e8e846542
commit bdcb177fbb
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/lldrawpoolsky.cpp
View File

@ -63,6 +63,8 @@ void LLDrawPoolSky::prerender()
void LLDrawPoolSky::render(S32 pass)
{
gGL.flush();
if (mDrawFace.empty())
{
return;
@ -111,13 +113,14 @@ void LLDrawPoolSky::render(S32 pass)
S32 face_count = (S32)mDrawFace.size();
LLVertexBuffer::unbind();
glColor4f(1,1,1,1);
for (S32 i = 0; i < llmin(6, face_count); ++i)
{
renderSkyCubeFace(i);
}
LLGLEnable blend(GL_BLEND);
glPopMatrix();
}

2
indra/newview/llvosky.cpp
View File

@ -304,7 +304,7 @@ void LLSkyTex::createGLImage(S32 which)
void LLSkyTex::bindTexture(BOOL curr)
{
gGL.getTexUnit(0)->bind(mTexture[getWhich(curr)]);
gGL.getTexUnit(0)->bind(mTexture[getWhich(curr)], true);
}
/***************************************